Branch merge a couple more changes.