Add debug log
Merge with master