Cherry-pick MR !326 to master branch
Ostap: backport some new featured from standalone version
See merge request !326 (merged)
(cherry picked from commit 14335452)
0b0524fa backport new features from standalone ostap 233ebf66 backport new features from standalone ostap 7f2618e8 backport new features from standalone ostap 6c261457 backport new features from standalone ostap 8637dd97 backport new features from standalone ostap dd2ff503 backport new features from standalone ostap 9fba7c05 backport new features from standalone ostap 582ee0b7 backport new features from standalone ostap