Merge "BUG 1883 - Ensure that all debug logging is done conditionally"