Merge QoS changes from devel to 7.3

Merge request reports

Loading