OPAL-2338: Fixing merge conflicts