Merge branch '3212_panel_columns'