Merge "Reduce some log spam" into sc-dev