Updated the latest changes

Updated to 1.7 DEV build