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