Pull 1.7 from wip