Snapshot of work before attempting to make special collection handling optional
Merge branch 'master' into issue53-attempt1