Acknowledgement fixes
Merge branch 'acknowledgement_fixes'
Merge branch 'master' of https://github.com/PBoudreau/HarmonyX