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

...nt.
Copyright on all new files should be 2014