Jira Issue: WP-795