Update to 0.8.2-SNAPSHOT