Merge branch '2459_inactive_panel'