Merge branch 'dsa-felix-qos'