Compatibility changes to work with the new multi-commit-ID API