Update to 0.3.10-SNAPSHOT