By: acbramley By: virag.jain By: mstrelan By: dcam By: nicxvan By: alexpott (cherry picked from commit 31e1980b)
Closes #3533299