am 20aa7cbe: Merge "Fixed and refactored profiler options handling"

* commit '20aa7cbe93d782e0e756a36e70d610fe84b4bbb4':
  Fixed and refactored profiler options handling