Merge "Add profiler type options"