Bulk update for 2.1rc1