Step-up Auth contribution MR reviews

Continues work started by @tachyons-gitlab in Step-up Auth contribution MR reviews (#509182 - closed) to support the contribution to be merge ready.