Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-2.0' into staging