Merge "Revert "Add debug logs""