Signed-off-by: Konstantin Boudnik <cos@boudnik.org> (cherry picked from commit b4c6b511e705230dfe4580288addacb81f5c5c5f)