Analysis/Ostap
See merge request !215 (merged)
(cherry picked from commit 8841c287)
e5710334 Analysis/Ostap