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