Closed DeD1rk closed 3 weeks ago
Closes #3683.
Supersedes #3717, which included an unrelated commit and was from a fork I don't have access to.
Closes #3683.
Supersedes #3717, which included an unrelated commit and was from a fork I don't have access to.