WP-1903 Build changes for testing this jira issue.