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