Cherry-pick MR !239 from 2018-patches to master
Ostap:(back)propagation of developments from the standalone version of ostap
See merge request !239 (merged)
(cherry picked from commit 11f22854)
Ostap:(back)propagation of developments from the standalone version of ostap
See merge request !239 (merged)
(cherry picked from commit 11f22854)