Merge "Improve profile processing"
am: f74388daf2

* commit 'f74388daf23522dd4e9ebe6640030f4fd52c52ea':
  Improve profile processing