Merge remote-tracking branch 'remotes/xanclic/tags/pull-block-2018-09-25' into staging