fixed merge conflicts
Merge branch 'profiling' into dev