Merge branch 'hotfix/cftime_update'
AE: Since generator options may be different between fast/slow channels we need to search for the corresponding source manually
Merge branch 'hotfix/match-fast-slow-sources' into develop