Cleanup, merge different versions, magic

Mark Pascal Sandersrequested to merge
merge_hmt_into_sdr into master

Further unravel the secrets of this cls file. Until this point, nothing was damaged. Proceed with upmost care.

Merge request reports