Update for rust from master