Merge branch 'release' into development
* Code cleanup
Merge branch 'development' into release