[PR] Readjust versioning to match develop branch