Merge "NONRTRIC-946: Capifcore - remove comment"