diff --git a/LICENSE.txt b/LICENSE.txt
index 4fc88098775c..74f1504175fd 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,3 +1,14 @@
+Although the code for this android client is free and available under the GPL2 license, Deutsche Telekom
+(including T-Systems) fully reserves all rights to the Telekom brand. To prevent users from getting confused about
+the source of a digital product or experience, there are stringent restrictions on using the Telekom brand and design,
+even when built into code that we provide. For any customization other than explicitly for Telekom or T-Systems, you must
+replace the Deutsche Telekom and T-Systems brand elements contained in the provided sources.
+
+To help you identify the brand elements, see:
+    ./drawable: folder contains brand-design specific icons or images
+    Brand-protected Magenta colour definitions are (unfortunately) spread over the source code.
+
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c89f2310843b..c1882f2fcee7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -62,7 +62,7 @@ configurations.configureEach {
 }
 
 // semantic versioning for version code
-val versionMajor = 3
+var versionMajor = 3
 val versionMinor = 35
 val versionPatch = 0
 val versionBuild = 52 // 0-50=Alpha / 51-98=RC / 90-99=stable
@@ -94,6 +94,10 @@ android {
 
     defaultConfig {
         applicationId = "com.nextcloud.client"
+        // NMC: to avoid merge conflicts, we do not change the original version settings.
+        // NMC: Instead, we override the local values with our own here and not touch the definition above.
+        versionMajor = 7
+        // NMC: end
         minSdk = 28
         targetSdk = 36
         compileSdk = 36
@@ -116,12 +120,9 @@ android {
         )
         testInstrumentationRunnerArguments["disableAnalytics"] = "true"
 
-        versionCode = versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
-        versionName = when {
-            versionBuild > 89 -> "${versionMajor}.${versionMinor}.${versionPatch}"
-            versionBuild > 50 -> "${versionMajor}.${versionMinor}.${versionPatch} RC" + (versionBuild - 50)
-            else -> "${versionMajor}.${versionMinor}.${versionPatch} Alpha" + (versionBuild + 1)
-        }
+        // NMC: using short version number for more readability
+        versionCode = Integer.parseInt("${versionMajor}${versionMinor}${versionPatch}${versionBuild}")
+        versionName = "${versionMajor}.${versionMinor}.${versionPatch}"
 
         // adapt structure from Eclipse to Gradle/Android Studio expectations;
         // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
diff --git a/gradle.properties b/gradle.properties
index 50cc48359122..f8329956eef4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,4 +22,5 @@ org.gradle.daemon=true
 org.gradle.configuration-cache=true
 
 # Needed for local libs
-# org.gradle.dependency.verification=lenient
+# uncomment below line for NMC Customization so that build won't fail due to gradle dependency verification
+org.gradle.dependency.verification=lenient
\ No newline at end of file