Merge latest quickmenu changes