HLT post-pre7 updates and fixes

HLT post-pre7 updates and fixes

Includes #5654 which thus could be closed.

This PR as well as #5530 and #5605 should be forward proted to 73X.