Collate sources.

(main@f7def04b9c8f3ba50dbcc3a75f7cbed2c2b4d7d0)