WP-4634 Initial version of code