Merge branch 'vs-2017-cl-check' into release-3.10

Merge-request: !1388