Merge pull request #14252 from jitendrapurohit/core-961