(cherry picked from commit 9e4f81e7)
Co-authored-by: Воробьев Тимофей Дмитриевич vorobev.td@phystech.edu