Fixes #21230