Backport Asset Import enhancement