Merge pull request #20280 from oskarirauta/nasm