Merge "Log when DEBUG is on" into sc-qpr1-dev