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