Merge "QoS: Remove type attribute from QoS rules" into feature/qos