Merge "Improve the version computation for the release notes"