OGM-532 Apply remarks after pull review