Finishes fixing ticket #8771 Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 320694ff84a609c5b0438c1f10da355cb48a0be3)
Finishes fixing ticket #8771 Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 320694ff84a609c5b0438c1f10da355cb48a0be3)