Backport 968 977 980 982 983 into 10.1.x maintenance
In this MR we backport !968 (merged), !977 (merged), !980 (merged), !982 (merged), !983 (merged) into 10.1.x maintenance
Edited by Yury Matveev
In this MR we backport !968 (merged), !977 (merged), !980 (merged), !982 (merged), !983 (merged) into 10.1.x maintenance