Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging