Make WP new path method more generic
Fix WP new path
Merge pull request #2185 from opf/hotfix/17286_not_possible_to_create_wp_with_activated_split_screen

17286 not possible to create wp with activated split screen