*8868* Back-port editable file changes to omp-stable-1_1