merging from master, hoping to fix jenkins failures related to export table.