Pulled in latest changes from v1.70