Build #7:   Fix import bugs. on branch master almost 5 years ago