Merge remote-tracking branch 'remotes/berrange/tags/qio-next-pull-request' into staging