Pull latest changes

Pull in the latest changes from the main tree.