WP-2354 Initial commit