Merge branch '2170_panel_header_color' into 4.7.5-stable