Review comments update

Jira Issue: WP-995