Issue #WP-1700