Signed-off-by: Nikita Zinkevich <n.zinkevich@yadro.com> (cherry picked from commit 495f745535)
495f745535