v13.06

Not ready to merge yet.