Backport 1021, 1019, 1017, 1012 and 1006 to 10.1.x

Yury Matveevrequested to merge
backport-1017-1019-to-10.1.x into maintenance/10.1.x

Here we backport !1021 (merged), !1019 (merged), !1017 (merged), !1012 (merged) and !1006 (merged) to 10.1.x branch to prepare 10.1.5 release

Edited by Yury Matveev

Merge request reports