Re-merge branch 'feature/9371_Refl_MVP_Base_Setup' into develop

This reverts commit 8d0a8735d1d1a1932a7951d346071392b1277d23, which is
reverting the original pull, because it broke the build. This one ought
to work.