Pull last minute change from 1.7.0