Preparation for 0.8.2