Backport !945, !954, update docs and bump version for 10.1.2 release

Yury Matveevrequested to merge
backport-945-954-into-10.1.x into maintenance/10.1.x

Related #741 (closed)

In this MR we do backport of !945 (merged) and !954 (merged) into 10.1.x branch.

Also bump release version and update docs

Edited by Anton Joubert

Merge request reports