Merge Panda's changes.