Rebase to 69 dev. Untested.