Analysis/Ostap:
See merge request !400 (merged)
(cherry picked from commit 05ecbb41)
89749014 Analysis/Ostap: 9093192c remove include