new main class
Merge branch 'new-commons' into develop