Merge remote-tracking branch 'remotes/elmarco/tags/ivshmem-fix-pull-request' into...