Merge "Extract profile files in their dedicated folder" into nyc-dev
am: 085e02ec76

* commit '085e02ec76788474029a1b4e0d7c02bbbb482499':
  Extract profile files in their dedicated folder