merge with 0.7.x and resolve any conflicts