BZ-1009030 - No way to import files

(cherry picked from commit 1adae09bd21af6363c8dffec1dee33ec83218676)