OP-4611 more last vestiges of a merge conflict