Preparation for 8.0 branch