Code

Merge branch 'vm/qos'