Org update and export regression