Merge branch '2466_menubar_not_drawn' into 4.7.5-stable