WP-3903 Initial commit