Merge pull request #4351 from lzto/nft-qos-mac