Signed-off-by: Denis Pronin <dannftk@yandex.ru> (cherry picked from commit 36e0d89a)
mentioned in commit 1a4d6e5c
mentioned in commit 16cac700