Merge issues

Jira Issue: WP-39