Avoid unnecessary calls to enableService
Fix recursive disabling
removed unnecessary ternary operator
Merge branch 'scabrero/core-disable-depends'

Conflicts:
	main/core/ChangeLog