Merge jjj5311's 1.7 upgrade