WIP: Upgrading to 0.13.0