423.02 merging OMC changes - config and config_app