artf230757: most of changes are to support HeD.
Merge branch 'master' of https://github.com/Apelon-VA/ISAAC
artf230757: HEd import and other task 6 fixes.