Merge remote-tracking branch 'afaerber-or/qom-next-2' into staging