fixed merge issue with overridden fields
Merge remote-tracking branch 'origin/master' into feature/BASE-3682-NeoPrep