Merge remote-tracking branch 'origin/feature/qos' into merge-branch

Change-Id: I7777c827f754e3269d69f6a5331325a76c5e57b2