CONN-1279a: Updated source after Core dependency and completed developme...

...nt.
Format tabs to spaces here.