DataRootHandler @DependsOn ("CdmInit"), to get initialization ordering correct;
FileCache.remove()
Merge remote-tracking branch 'origin/target-4.3.17' into target-4.3.17