Import now takes into account few collections and few folders.
Merge remote-tracking branch 'origin/master'