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