Merge remote-tracking branch 'afaerber/qom-cpu' into staging