Further debugging Jira Issue: WP-794