intermittent commit #666
Merge branch 'master' into dev-als364
fixing merge conflicts
intermittent commit #667...?
Merge branch 'master' into dev-als364
preliminary refactor complete
intermittent commit #9823
fixed merge conflicts in major refactor