WP-1867 Build change