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