Merge branch 'feature/admin_page' into develop
Add some scenarios