Merge master: dinosaur fusion