By: mcdruid By: smustgrave By: cmlara By: kim.pepper By: benjifisher By: alexpott By: mohit_aghera By: longwave By: xjm (cherry picked from commit c30d609d)
Closes #3516706