Merge branch '2520_ctrlg_closes_panels_stable' into 4.7.5-stable