Merge "Add 5G/NR QOS support"