By: mherchel By: f0ns By: smustgrave By: longwave By: catch (cherry picked from commit 41e2e84c)
Closes #3628565