Backporting PR 52 and 53 to support logging workspace