NMS-5814 bomb if import files have removed attributes
Merge branch '1.12'