Merge "Add debug logs"