Resyncing repo with primary fork

Now that the discrepancies are cleared, I can resync the branches.