Signed-off-by: Stevie Robinson <stevie.robinson@gmail.com> (cherry picked from commit 07fbb0d1f464513ed28721d6c91d428dd54818cf) Closes #9627