Regression in 58da81a5a372a69f0bac801c412b57f3cce5f188 and prerequisite for refs #28896. Backport of 10bfa876be59feec24bb6a40fa11bece808ee405 from master
Regression in 58da81a5a372a69f0bac801c412b57f3cce5f188 and prerequisite for refs #28896. Backport of 10bfa876be59feec24bb6a40fa11bece808ee405 from master