Fixes part of ticket #8771 Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 2c844c98285ca03d9cc44db920da645cf0376c40)
Fixes part of ticket #8771 Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 2c844c98285ca03d9cc44db920da645cf0376c40)