refactor to tease apart HA from regular
Merge remote-tracking branch 'origin/master'
added version