md3-vanilla changes from SSNTails, round 1

mazmazzrequested to merge
md3-vanilla-ssn into md3-vanilla

Changes from !418 (merged) including compile fixes for buildbot approval

Merge request reports