Merge pull request #17671 from tohojo/sqm-nft