Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> (cherry picked from commit 40fb387185527db5eb03be34ea35f24d3e7bedcd)