Merge "NONRTRIC - PMS Fix dynamic configuration"