Closes #14314: backported fix.
1 file changed