Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
(cherry picked from commit e9d4b42b)