Fixes #27586
mentioned in merge request !3188 (merged)
mentioned in commit 6a661074
mentioned in merge request !3350 (merged)