Refactoring; version 2.0.8 release.
Refactoring; versionof core and admin 2.0.8 merge.