Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into...