BS-7774
Add startup extension point (bad merge seems to have removed it)
Fix fallback url
Merge branch 'MasterBugFixing' into BS-7901_GroupIteratorExport