* Merging QoS related changes from 3.5.0 branch to trunk.