Preparation for v0.8