Signed-off-by: Stevie Robinson <stevie.robinson@gmail.com> (cherry picked from commit 79907c881cc92ce9ee3973d5cf21749fe5fc58da) Closes #9604