Merge branch 'user_panel'