REISSUE: Remnant surrogate models NRSur7dq4Remnant and NRSur3dq8Remnant
Description
This is a reissue of MR !1074 (merged), since the commits in that MR were accidentally squashed.
This MR now reverts the commit of !1074 (merged) and adds the original commits individually.