Prepared for V0.8.2-SNAPSHOT