Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-11-20' into...