*8868* Back-port listbuilder changes to omp-stable-1_1