Pull 1.6 from wip