Debugging

Jira Issue: WP-794