Adding a Patch that does some house keeping.
Merge branch 'hotfix-3.0.1'