! Actually fix #2375 this time, and do some general code cleanup as well
Merge pull request #2387 from Oldiesmann/release-2.1

! Actually fix #2375 this time, and do some general code cleanup as well