Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> (cherry picked from commit e3e2a3e0e581da39dcd9268951edb52f68916940)