Fixes #17228 on branch 1.9