Ostap:
See merge request !241 (merged)
(cherry picked from commit 4f3922ef)
6d416693 Ostap: be8f775a Ostap: 29134ac4 minor fix d6477620 Ostap: