MT#7793 Fix dependecy and file index handling.