circuit
default circuit conf
Merge branch 'develop' into feature-fixCircuit

Conflicts:
	CHANGES.md
Merge branch 'feature-fixCircuit' into develop