Review comments

Jira Issue: WP-995