Merge pull request #2332 from Oldiesmann/release-2.1

2.0.9 Fixes