Manifest fix. There was an error with cloning it. Milestone 3
Tag for Milestone 3
Tag for Milestone 2
Tag for Milestone 1.