WP-3862 Initial commit