More Refactoring.
Merge branch 'master' into release