WP-1459:FIXED