Merge from master
Updating web logger to reflect recent abstraction