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