Merge branch 'hotfix/redirect_to_admin_after_sign_in'

* hotfix/redirect_to_admin_after_sign_in:
  edit redirect
fix page show
Merge branch 'hotfix/fix_page_show' into develop

* hotfix/fix_page_show:
  fix page show