Merge "Fix logging bugs" into sc-dev