Updating changes for 1.7