This does not change the behavior except for fixing the issue #11404. Fixes #11404. (cherry picked from commit e1f717d4)