Merge "Create profiles folders" into nyc-dev