Final Commit for 1.7