#1081 fixed a few problems related to a previous incorrect merge and removed unrelated projects from the solution.