Merge pull request #1395 from brucehoff/PLFM-2859

Plfm 2859
make profiler profile everything
remove unneeded reference
Merge pull request #1398 from marcel-blonk/release-48

make profiler profile everything
Merge branch 'release-48' into develop