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