Re #7770 fix old import
Merge branch 'feature/7770_fix_apiv1_import' into develop