Update with latest -dev changes.