Merge branch 'feature/route_to_admin' into develop
Changing alias and name
Merge branch 'feature/change_alias_and_name_61' into staging