First steps upgrading to 1.7.10