By: catch By: berdir By: tsphethean By: sukr_s By: smustgrave By: heddn By: nicxvan By: godotislate (cherry picked from commit 9a96116d)
Closes #3582098