Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-2020-06-15' into staging