Merge pull request #17024 from jitendrapurohit/core-1696