Includes manual fixes for weird changeset graph due to conversion errors around the upstream branching point