#20269 hofix for before_filters in user_controller
Merge branch 'master' into development