Bulk load related fixes (snapshots and filter file)

Change-Id: I87ff3abb8c0995878c166f978b54fb1f8c2955f0
Merge "Bulk load related fixes (snapshots and filter file)"