Merge "feat(makefile): incrementing minor version to reflect v2.5 release" into integration