Merge "[AWARE] Enhance debug logs"