Merge "Clean up logging" into sc-dev