Merge "Update and improve profiles format" into nyc-dev