Merge "Add updateGlobalPropertiesJson controller"