By: dieterholvoet By: longwave By: thirteenthdown (cherry picked from commit fbbb893d)
Closes #3390193