Revert back to 1.6 + merge correct 1.61 changes