Draft: Bug 31161 01

Replacement for !3 (closed) and rebased onto master.

Closes #31161 (closed)

Note, I see this MR includes two additional commits, I assume the sync from gitolite to gitlab failed when those changes were merged.