4.1.1 merge and menu fix