Mingle#216 merge of OGL updates (12315)