Update to 0.13.8-SNAPSHOT