Another update for rust from master