Merge remote-tracking branch 'remotes/kraxel/tags/ui-20171117-pull-request' into...