Fix F1 data import type mismatch
Merge branch 'develop'