Re-configure so that single mode is the default
Merge branch 'master' into virtual_collections
Actually we don't need to re-index after adding this node