Merge remote-tracking branch 'remotes/berrange-gitlab/tags/misc-next-pull-request...