Add default setting to activate NMS-5777 fix