Signed-off-by: Stevie Robinson <stevie.robinson@gmail.com> (cherry picked from commit 8dd3b45c90209136c0bd0a861061c6d20837d62f) Closes #4475