update for rust master branch