Logging for SWC-610
Merge pull request #338 from xschildw/SWC-610-track-u

Logging for SWC-610