adding logging capabilities
Merge community changes