Re #7770 fix old import
Merge remote-tracking branch 'origin/feature/7770_fix_apiv1_import'