Hopefully resolving namespace issues
partial stash
Merge branch 'LoggerFix' into ts_dist