Merge "Fixed and refactored profiler options handling"