LPS-39361 import previews

Alex,

hope everything is ok.

Don't know why you had conflicts, I could merge with master without any problem.