Merge "DynamicCodeLoggingService: avoid object churn" into sc-dev