OP-1329 fix a cherry-pick issue