Prepare for V1.7