By: joachim By: mstrelan By: brandonlira By: dcam By: nitinkumar_7 By: longwave (cherry picked from commit ea9e2403)
Closes #3585774