(cherry picked from commit 5e9e61ada7aa29f20116b90e1cf81a60535143a9) Co-authored-by: Dima Strizhikozin <dmitry.strizhikozin@bell-sw.com>
(cherry picked from commit 5e9e61ada7aa29f20116b90e1cf81a60535143a9) Co-authored-by: Dima Strizhikozin <dmitry.strizhikozin@bell-sw.com>