collecting changes prior to branching
put back ha pull 34 code changes, which had been dropped in error