WP-1009. Rebase WP-1031