WP-1799 Added feature setting by hand to see if this will help set correctly.