Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190705-pull-request' into...