Merge pull request #14400 from FrederickGeek8/fix-14287