Merge "Clean-up debug logs" into main