WP-1892 Build change