Merge branch '2171_popup_menu_colors'