Merge pull request #22937 from scmmishra/fix-item-configure-13-beta