Commit v6 compatible version