Further tweaks for the Key module integration

Closes #3544968

Merge request reports

Loading