WP-2052 Added