CHRONX-27 cleanup
Merge branch 'master' into HFT-JLANGX-11-MMF