Closed sauclovian-g closed 2 weeks ago
(see commit for description)
Fixes #2120.
(force-pushed to squash)
(see commit for description)
Fixes #2120.