Merge pull request #13741 from jitendrapurohit/core-770