Merge "Update and improve profiles format" into nyc-dev
am: 21fae84

* commit '21fae845af390fb86831a55db79672587bb17761':
  Update and improve profiles format