Merge branch '2991_label_redraw'