Merge branch '1939_save_panels_ini'