Ensured user_menu is based on current logged in user
Merge remote-tracking branch 'origin' into release