Merge "Add Logging support for WF"