Merge pull request #2413 from rosysong/nft-qos