Merge "Fix logging bug" into sc-dev