Merge pull request #14102 from jitendrapurohit/core-888