Merge branch 'Modification-circuit' into PanelCircuit