diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index ae7aeb6..ce0521a 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -60,10 +60,6 @@ jobs:
       - name: Restore
         run: dotnet restore ${{ env.SolutionFile }}
 
-      - name: Build submodule
-        shell: cmd
-        run: BuildSubmodule.bat
-
       - name: Build Release
         if: inputs.release
         run: dotnet build ${{ env.SolutionFile }} -c ${{ inputs.configuration }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b57ace0..5ed8728 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## Version 7.35.0 - 2026-09-25
+
+### Added
+
+- Added `ScheduledActivity` and `ScheduledActivities` protos in `Common\Activity` proto.
+
 ## Version 7.34.0 - 2026-09-23
 
 ### Added
diff --git a/src/ONE.Interfaces.ProtocolBuffers b/src/ONE.Interfaces.ProtocolBuffers
index 9e0e8d9..238fc27 160000
--- a/src/ONE.Interfaces.ProtocolBuffers
+++ b/src/ONE.Interfaces.ProtocolBuffers
@@ -1 +1 @@
-Subproject commit 9e0e8d9130d22f55c731be08aeb20232a93bc34b
+Subproject commit 238fc27420dcd74a2b0186a4145d6a9000547f6e
diff --git a/src/ONE.Models.CSharp/BuildSubmodule.bat b/src/ONE.Models.CSharp/BuildSubmodule.bat
index 4f5f0db..e12e9a9 100644
--- a/src/ONE.Models.CSharp/BuildSubmodule.bat
+++ b/src/ONE.Models.CSharp/BuildSubmodule.bat
@@ -1,14 +1,18 @@
 @rem Clean up temporary flat proto files and previous generated cs files for a clean generation
-IF EXIST "..\ONE.Interfaces.ProtocolBuffers\proto\flat" rd /q /s "..\ONE.Interfaces.ProtocolBuffers\proto\flat"
-IF EXIST "generated" rd /q /s "generated"
-
+set "BASE_DIR=%~dp0"
+cd "%BASE_DIR%" || exit /b 1
+IF EXIST "..\ONE.Interfaces.ProtocolBuffers\proto\flat" rd /q /s "..\ONE.Interfaces.ProtocolBuffers\proto\flat" || exit /b 1
+IF EXIST "generated" rd /q /s "generated" || exit /b 1
 
 @rem Generate all the C# classes from proto files
 cd ..\ONE.Interfaces.ProtocolBuffers\generators
-Powershell.exe -executionpolicy Bypass -File gen_all.ps1
+Powershell.exe -executionpolicy Bypass -File gen_all.ps1 || exit /b 1
 
-@rem Create folder
-mkdir ..\..\ONE.Models.CSharp\generated
+mkdir ..\..\ONE.Models.CSharp\generated || exit /b 1
 
 @rem Copy to local folder
-copy ..\proto\flat\out\csharp\* ..\..\ONE.Models.CSharp\generated
\ No newline at end of file
+copy ..\proto\flat\out\csharp\* ..\..\ONE.Models.CSharp\generated || exit /b 1
+
+if errorlevel 1 exit /b %errorlevel%
+
+exit /b 0
\ No newline at end of file
diff --git a/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj b/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj
index 0dc9a45..5339505 100644
--- a/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj
+++ b/src/ONE.Models.CSharp/ONE.Models.CSharp.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <!--For Release packages update
     the VersionPrefix and remove any VersionSuffix-->
-    <VersionPrefix>7.34.0</VersionPrefix>
+    <VersionPrefix>7.35.0</VersionPrefix>
     <!--For Feature packages update the VersionSuffix with the jira ticket number-->
     <VersionSuffix></VersionSuffix>
     <LangVersion>latest</LangVersion>
@@ -27,4 +27,17 @@
     <PackageReference Include="Google.Protobuf" Version="3.19.1" />
   </ItemGroup>
 
+  <Target
+    Name="BuildProtocolBufferSubmodule"
+    BeforeTargets="CoreCompile"
+    Condition="'$(BuildingProject)' == 'true'">
+    <Exec
+      Command="call &quot;$(MSBuildProjectDirectory)\BuildSubmodule.bat&quot;"
+      WorkingDirectory="$(MSBuildProjectDirectory)" />
+    <ItemGroup>
+      <Compile Remove="generated\**\*.cs" />
+      <Compile Include="generated\**\*.cs" />
+    </ItemGroup>
+  </Target>
+
 </Project>
\ No newline at end of file