Bulk Extract fixes

Change-Id: Ic2d6369c0dfc61cd647715befa810c0442124d91
Merge "Bulk Extract fixes"