Merge branch '3914_usermenu_view'