Fixes #6802: Allow specifying initial org and location.