More production like configuration (remove profiler)
Merge branch 'master' into PIM-1265