Hb general sec2 ah

Replacess !16618 (closed)

I can't for the life of me figure out how to get the merge request to go through manually, so I'm trying this once more.

cc @jkalimon