Merge "Update properties' config"