By: pcambra By: quietone By: berdir By: cmlara By: dcam By: smustgrave By: catch By: godotislate By: drumm By: longwave (cherry picked from commit 2d50129e)
Closes #3579778