Resync with parent

Pull in Dan's improvements