Merge "Reorder migration of settings from db to xml" into nyc-dev