This merge request should tidy up the entire history of the repository, given that not all the branches made sense.
Request 1/3