Merge pull request #22819 from scmmishra/iff