Patch 2

More consolidating of branches.