Merge branch 'nd/versioncmp-prereleases'