Merge pull request #11841 from jitendrapurohit/core-26