Fixed bad merge resolution
Merge remote-tracking branch 'origin/runtime_import' into next

* origin/runtime_import:
  Fixed bad merge resolution