diff --git a/.drone.env b/.drone.env
index 667a1868ce8..807a6b899fa 100644
--- a/.drone.env
+++ b/.drone.env
@@ -1,6 +1,6 @@
 # The test runner source for API tests
-CORE_COMMITID=403bd55c38a823f7915a04105e95fad5db84185b
-CORE_BRANCH=master
+CORE_COMMITID=b19721114df5cefeca22926a97e635245849ddf6
+CORE_BRANCH=version-status-php-fix2
 
 # The test runner source for UI tests
 WEB_COMMITID=b747d299b66a2f9f11559c8c14ce3d6fd64a6135
diff --git a/extensions/frontend/pkg/revaconfig/config.go b/extensions/frontend/pkg/revaconfig/config.go
index 6adf5740bd9..a7f30597c3a 100644
--- a/extensions/frontend/pkg/revaconfig/config.go
+++ b/extensions/frontend/pkg/revaconfig/config.go
@@ -143,7 +143,7 @@ func FrontendConfigFromStruct(cfg *config.Config) map[string]interface{} {
 									"versionstring":  version.GetString(),
 									"edition":        "Community",
 									"productname":    "Infinite Scale",
-									"product":        "oCIS",
+									"product":        "Infinite Scale",
 									"hostname":       "",
 								},
 								"support_url_signing": true,
@@ -212,12 +212,12 @@ func FrontendConfigFromStruct(cfg *config.Config) map[string]interface{} {
 							},
 						},
 						"version": map[string]interface{}{
-							"product": "oCIS",
+							"product": "Infinite Scale",
 							"edition": "Community",
 							"major":   version.Parsed().Major(),
 							"minor":   version.Parsed().Minor(),
 							"micro":   version.Parsed().Patch(),
-							"string":  version.String,
+							"string":  version.GetString(),
 						},
 					},
 				},
diff --git a/extensions/ocdav/pkg/config/defaults/defaultconfig.go b/extensions/ocdav/pkg/config/defaults/defaultconfig.go
index b2c917765cb..dcf990ab425 100644
--- a/extensions/ocdav/pkg/config/defaults/defaultconfig.go
+++ b/extensions/ocdav/pkg/config/defaults/defaultconfig.go
@@ -46,7 +46,7 @@ func DefaultConfig() *config.Config {
 		Status: config.Status{
 			Version:       version.Long(),
 			VersionString: version.GetString(),
-			Product:       "oCIS",
+			Product:       "Infinite Scale",
 			ProductName:   "Infinite Scale",
 			Edition:       "Community",
 		},
diff --git a/ocis-pkg/version/version.go b/ocis-pkg/version/version.go
index 6ef03d8c179..1cfabd6f2ff 100644
--- a/ocis-pkg/version/version.go
+++ b/ocis-pkg/version/version.go
@@ -21,38 +21,32 @@ func Compiled() time.Time {
 	return t
 }
 
+// GetString returns a version string with pre-releases and metadata
 func GetString() string {
-	if String == "dev" {
-		return "0.0.0+dev"
-	}
-	parsedVersion, err := semver.NewVersion(String)
-	// We have no semver version but a commitid
-	if err != nil {
-		return String
-	}
-	return parsedVersion.String()
+	return Parsed().String()
 }
 
+// Parsed returns a semver Version
 func Parsed() *semver.Version {
-	var versionToParse string
+	versionToParse := String
 	if String == "dev" {
 		versionToParse = "0.0.0+dev"
 	}
 	parsedVersion, err := semver.NewVersion(versionToParse)
 	// We have no semver version but a commitid
 	if err != nil {
-		parsedVersion, _ = semver.NewVersion("0.0.0+" + String)
+		parsedVersion, err = semver.NewVersion("0.0.0+" + String)
+		// this should never happen
+		if err != nil {
+			return &semver.Version{}
+		}
 	}
 	return parsedVersion
 }
 
+// Long returns the legacy version with 4 number parts like 10.9.8.0
 func Long() string {
-	var s string
-	if Parsed().Metadata() == "" {
-		s = "-" + Parsed().Prerelease()
-	}
-	s = "+" + Parsed().Metadata()
 	return strconv.FormatInt(Parsed().Major(), 10) + "." +
 		strconv.FormatInt(Parsed().Minor(), 10) + "." +
-		strconv.FormatInt(Parsed().Patch(), 10) + "." + "0" + s
+		strconv.FormatInt(Parsed().Patch(), 10) + "." + "0"
 }
diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
index ab30ab97952..086d3b93a4b 100644
--- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md
+++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
@@ -1613,10 +1613,6 @@ Not everything needs to be implemented for ocis. While the oc10 testsuite covers
 
 - [apiMain/checksums.feature:233](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiMain/checksums.feature#L233)
 
-#### [status does not have new product data item](https://github.com/owncloud/ocis/issues/3317)
-
-- [apiCapabilities/capabilities.feature:959](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiCapabilities/capabilities.feature#L959)
-
 #### public links without permission are allowed now
 
 - [apiShareUpdateToShares/updateShare.feature:113](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareUpdateToShares/updateShare.feature#L113)