Merged popup_menu into v1.61