Prepare for 1.7