Fixed error which skipped the execution of _preSetConf
Merge branch '3.4' into jag/network-preset

Conflicts:
	main/network/ChangeLog
Merge branch 'jag/network-preset' into 3.4