423.05 merging OMC changes - updated settings