fix 404 in panel for normal users
Merge branch 'master' into rc
Merge branch 'rc' into stable