Regression in 58da81a5a3 and prerequisite for refs #28896. Backport of 10bfa876be from master
58da81a5a3
10bfa876be