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

...nt.
Is this part of Event Logging?  If so, it should be removed.