Add debug info
Merge remote-tracking branch 'origin/integration-v2.0' into integration-v2.0