Initialise file groups synchronously
Merge remote-tracking branch 'matthias-ronge/issue_228' into feature-zm