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