Studio/fix import performance

STUD-1994 Fix performance issues with XML import.