Merge "Extract profile files in their dedicated folder" into nyc-dev