Branches: Update to recent class swap by GitHub