Merge branch '1663_save_panels_state'