NEVSTOP-LAB · nevstop · Apr 16, 2026 · Apr 16, 2026 · Apr 17, 2026 · Apr 20, 2026
diff --git a/.github/workflows/Check_Broken_VIs.yml b/.github/workflows/Check_Broken_VIs.yml
@@ -52,4 +52,3 @@ jobs:
           Parameter2: NOPASSWORD
           Parameter3: YES
           Parameter4: -placeContent
-        timeout-minutes: 5
diff --git a/Communicable State Machine(CSM).lvproj b/Communicable State Machine(CSM).lvproj
@@ -589,6 +589,11 @@
 			<Item Name="Global_Interface.ctl" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/API/Global_Interface.ctl"/>
 			<Item Name="Item_Interface.ctl" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/API/Item_Interface.ctl"/>
 			<Item Name="provcom_StringGlobals.vi" Type="VI" URL="/&lt;resource&gt;/Framework/Providers/Common/provcom_StringGlobals.vi"/>
+			<Item Name="InitCSMs.vi" Type="VI" URL="../testcases/CSM/InitCSMs.vi"/>
+			<Item Name="StartCSMs.vi" Type="VI" URL="../testcases/CSM/StartCSMs.vi"/>
+			<Item Name="GetPathByPrototypeName.vi" Type="VI" URL="../testcases/CSM/GetPathByPrototypeName.vi"/>
+			<Item Name="Prototypes.vi" Type="VI" URL="../testcases/CSM/Prototypes.vi"/>
+			<Item Name="Build CSM to PPL.vi" Type="VI" URL="../testcases/CSM/Build CSM to PPL.vi"/>
 		</Item>
 		<Item Name="Build Specifications" Type="Build">
 			<Item Name="Communicable State Machine.lvlibp" Type="Packed Library">

diff --git a/Communicable State Machine(CSM).vipb b/Communicable State Machine(CSM).vipb
diff --git a/...ption/VI Description(en-us)/VI Description(en-us) - 05. Module Operation API.md b/...ption/VI Description(en-us)/VI Description(en-us) - 05. Module Operation API.md
@@ -140,12 +140,13 @@ API: Do Something Else -@ csm
 -- <b>Controls</b> --
 - <b>Current Module ("" to Generate an ID)</b>: Name of the current module. If empty, a temporary ID is generated for debugging purposes to identify the location.
 - <b>CSM Scripts</b>: CSM commands to execute.
+- <b>Sync Response Only (F)</b>: Whether <b>Response</b> should include only responses from synchronous messages. Disabled by default.
 - <b>Continue If Error? (F)</b>: Whether to continue execution if an error occurs. The default is FALSE, which specifies to not continue.
 - <b>Wait (5000 ms)</b>: Timeout duration for waiting module to be alive. The default is 5000 ms.
 - <b>Response Timeout (-2 Using Global Settings)</b>: Timeout for synchronous calls. The default is -2, which uses the global setting. You can set the global timeout using the CSM - Set TMO of Sync-Reply VI.
 
 -- <b>Indicators</b> --
-- <b>Response</b>: Returned results from executing the script. Only synchronous messages carry returns. The corresponding column for other commands will be an empty string.
+- <b>Response</b>: Results returned by the script. When <b>Sync Response Only (F)</b> is enabled, this output includes only responses from synchronous messages. Otherwise, each script line, including blank lines and comments, produces one result in order. Non-synchronous commands return an empty string.
 - <b>Scripts Left</b>: Remaining unexecuted scripts.
 
 ## CSM - Broadcast Event.vi

diff --git a/...escription/VI Description(en-us)/VI Description(en-us) - 09. Build-in Addons.md b/...escription/VI Description(en-us)/VI Description(en-us) - 09. Build-in Addons.md
@@ -14,13 +14,17 @@ Starts the CSM Watchdog thread to monitor whether the main program has exited. I
 
 > - Ref: CSM WatchDog Implementation Principle
 
+-- <b>Controls</b> --
+- <b>Wait(5000ms)</b>: The time the Watchdog thread waits for modules to process `Macro: Exit` and exit, in milliseconds (ms). The default value is 5000 ms.
+
 ### CSM Watchdog Thread.vi
 The CSM Watchdog thread is used to ensure that all asynchronously started CSM modules can exit normally after the main program exits.
 
 > - Ref: CSM WatchDog Implementation Principle
 
 -- <b>Controls</b> --
 - <b>Watchdog Queue</b>: Watchdog queue resource.
+- <b>Wait(5000ms)</b>: The time the Watchdog thread waits for modules to process `Macro: Exit` and exit, in milliseconds (ms). The default value is 5000 ms.
 
 ## CSM File Logger Addon
 
@@ -111,6 +115,9 @@ The loop can be ended by removing `-><loop>`. You can use the following VIs to r
 > [!WARNING]
 > <b>Add to Front? (F)</b> is usually FALSE because once a loop state starts, it does not end immediately. Before insertion into the state queue, it is considered a sub-state of the current state. If the current state was called via a synchronous message, it would not return immediately. For example, if a set of continuous acquisition states is defined in `API: Start DAQ` and this message is sent synchronously from outside, the logic should be to start the loop and then return immediately. Only set <b>Add to Front? (F)</b> to TRUE if the logic is to wait for the loop to end before returning.
 
+> [!WARNING]
+> Be careful not to connect <b>State Queue</b> and <b>Loop States</b> in reverse. If reversed, it may cause synchronous messages sent externally to fail to return, and external messages can no longer be processed.
+
 -- <b>Controls</b> --
 - <b>States Queue</b>: Connect the entire state queue to this input.
 - <b>Loop States</b>: Loop states.

diff --git a/...ption/VI Description(zh-cn)/VI Description(zh-cn) - 05. Module Operation API.md b/...ption/VI Description(zh-cn)/VI Description(zh-cn) - 05. Module Operation API.md
@@ -141,12 +141,13 @@ API: Do Something Else -@ csm
 -- <b>输入控件(Controls)</b> --
 - <b>Current Module ("" to Generate an ID)</b>: 当前模块名称，当没有输入时，生成一个临时ID，便于调试判断位置。
 - <b>CSM Scripts</b>: 待运行的CSM指令。
+- <b>Sync Response Only (F)</b>: <b>Response</b>中是否仅包含同步消息的响应，默认不启用。
 - <b>Continue If Error? (F)</b>: 发生错误时是否继续执行, 默认不继续执行。
 - <b>Wait (5000 ms)</b>: 等待超时时间，默认为5000 ms。
 - <b>Response Timeout (-2 Using Global Settings)</b>: 同步调用的超时时间，默认为-2，使用全局设置。你可以通过CSM - Set TMO of Sync-Reply VI设置全局超时时间。
 
 -- <b>输出控件(Indicators)</b> --
-- <b>Response</b>: 执行脚本的返回结果。只有同步消息才会携带返回，其他的指令对应列为空字符串。
+- <b>Response</b>: 执行脚本的返回结果。<b>Sync Response Only (F)</b>启用时仅包含同步消息的响应，否则每一行指令,包括空行和注释，都对应了一个返回结果，按照顺序排列，非同步消息的响应为空字符串。
 - <b>Scripts Left</b>: 剩余未执行的脚本。
 
 ## CSM - Broadcast Event.vi

diff --git a/...escription/VI Description(zh-cn)/VI Description(zh-cn) - 09. Build-in Addons.md b/...escription/VI Description(zh-cn)/VI Description(zh-cn) - 09. Build-in Addons.md
@@ -14,13 +14,17 @@
 
 > - Ref: CSM WatchDog实现的原理
 
+-- <b>输入控件(Controls)</b> --
+- <b>Wait(5000ms)</b>: Watchdog线程等待模块处理"Macro: Exit"退出的时间，单位为毫秒(ms)，默认值为5000ms。
+
 ### CSM Watchdog Thread.vi
 CSM Watchdog线程，用于保证在主程序退出后，所有的异步启动的CSM模块都能正常退出。
 
 > - Ref: CSM WatchDog实现的原理
 
 -- <b>输入控件(Controls)</b> --
 - <b>Watchdog Queue</b>: Watchdog队列资源。
+- <b>Wait(5000ms)</b>: Watchdog线程等待模块处理"Macro: Exit"退出的时间，单位为毫秒(ms)，默认值为5000ms。
 
 ## CSM File Logger Addon
 
@@ -114,6 +118,9 @@ CSM - Start File Logger VI中原本使用的线程VI。已废弃，目前使用C
 >
 > <b>Add to Front? (F)</b> 通常为FALSE，因为循环状态一旦开始，就不会立即结束，插入状态队列前，会被认为是当前状态的子状态，此时如果当前状态如果是以同步消息调用，就不会立即返回。例如: 假如`API: Start DAQ`中，定义了一组连续采集的状态，此时外部同步发送该消息，逻辑应为启动循环，然后立即返回。只有逻辑为等待循环结束后返回，才设置<b>Add to Front? (F)</b>为TRUE。
 
+> [!WARNING]
+> 注意<b>State Queue</b> 和 <b>Loop States</b> 的连线不要连反了，如果连反了，可能会造成外部发送的同步消息无法返回，并无法再处理外部消息的情况。
+
 -- <b>输入控件(Controls)</b> --
 - <b>States Queue</b>: 整个状态队列被连接到此输入。
 - <b>Loop States</b>: 循环状态。

diff --git a/src/project/Communicable State Machine(CSM)/Open CSM_Tool_Launcher.vi b/src/project/Communicable State Machine(CSM)/Open CSM_Tool_Launcher.vi
diff --git a/....lib/_NEVSTOP/Communicable State Machine(CSM)/AdvanceAPI/CSM - Compact Multiple States.vi b/....lib/_NEVSTOP/Communicable State Machine(CSM)/AdvanceAPI/CSM - Compact Multiple States.vi
diff --git a/...b/_NEVSTOP/Communicable State Machine(CSM)/AdvanceAPI/CSM - Make String Arguments Safe.vi b/...b/_NEVSTOP/Communicable State Machine(CSM)/AdvanceAPI/CSM - Make String Arguments Safe.vi
diff --git a/..._NEVSTOP/Communicable State Machine(CSM)/AdvanceAPI/CSM - Revert Arguments-Safe String.vi b/..._NEVSTOP/Communicable State Machine(CSM)/AdvanceAPI/CSM - Revert Arguments-Safe String.vi
diff --git a/src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/AdvanceAPI/CSM - Run Script.vi b/src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/AdvanceAPI/CSM - Run Script.vi
diff --git a/src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/Communicable State Machine.lvlib b/src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/Communicable State Machine.lvlib
diff --git a/...TOP/Communicable State Machine(CSM)/_Support/lvlibpSupport/Check Compatibility for CSM.vi b/...TOP/Communicable State Machine(CSM)/_Support/lvlibpSupport/Check Compatibility for CSM.vi
diff --git a/src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/_scripts/FixJKIHelper.vi b/src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/_scripts/FixJKIHelper.vi
diff --git a/src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/_scripts/_csm_System_Language.vi b/src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/_scripts/_csm_System_Language.vi
diff --git a/...r.lib/_NEVSTOP/Communicable State Machine(CSM)/_scripts/_script_enable_run_when_opened.vi b/...r.lib/_NEVSTOP/Communicable State Machine(CSM)/_scripts/_script_enable_run_when_opened.vi
diff --git a/.../_NEVSTOP/Communicable State Machine(CSM)/_scripts/_script_set_csm_doc_case_as_default.vi b/.../_NEVSTOP/Communicable State Machine(CSM)/_scripts/_script_set_csm_doc_case_as_default.vi
diff --git a/...lib/_NEVSTOP/Communicable State Machine(CSM)/_tool/_debugConsole/CSM - Debug Console 2.vi b/...lib/_NEVSTOP/Communicable State Machine(CSM)/_tool/_debugConsole/CSM - Debug Console 2.vi
diff --git a/...er.lib/_NEVSTOP/Communicable State Machine(CSM)/_tool/_debugConsole/Module Information.vi b/...er.lib/_NEVSTOP/Communicable State Machine(CSM)/_tool/_debugConsole/Module Information.vi
diff --git a/...er.lib/_NEVSTOP/Communicable State Machine(CSM)/addons/Logger/CSM-Logger-Thread(Event).vi b/...er.lib/_NEVSTOP/Communicable State Machine(CSM)/addons/Logger/CSM-Logger-Thread(Event).vi
diff --git a/src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/addons/Logger/CSM-Logger-Thread.vi b/src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/addons/Logger/CSM-Logger-Thread.vi
diff --git a/.../_NEVSTOP/Communicable State Machine(CSM)/addons/Logger/_Support/List Rules as Strings.vi b/.../_NEVSTOP/Communicable State Machine(CSM)/addons/Logger/_Support/List Rules as Strings.vi
diff --git a/...VSTOP/Communicable State Machine(CSM)/addons/Loop-Support/CSMLS - Define Loop State(s).vi b/...VSTOP/Communicable State Machine(CSM)/addons/Loop-Support/CSMLS - Define Loop State(s).vi
diff --git a/...ble State Machine(CSM)/addons/Watchdog/CSM - Start Watchdog to Ensure All Modules Exit.vi b/...ble State Machine(CSM)/addons/Watchdog/CSM - Start Watchdog to Ensure All Modules Exit.vi
diff --git a/.../_NEVSTOP/Communicable State Machine(CSM)/addons/Watchdog/_support/CSM Watchdog Thread.vi b/.../_NEVSTOP/Communicable State Machine(CSM)/addons/Watchdog/_support/CSM Watchdog Thread.vi
diff --git a/testcases/CSM-New-Testcases.lvproj b/testcases/CSM-New-Testcases.lvproj
@@ -11,7 +11,15 @@
 		<Property Name="server.vi.callsEnabled" Type="Bool">true</Property>
 		<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
 		<Property Name="specify.custom.address" Type="Bool">false</Property>
-		<Item Name="CSM-Testcase.lvlib" Type="Library" URL="../CSM/CSM-Testcase.lvlib"/>
+		<Item Name="CSM" Type="Folder">
+			<Item Name="CSM-Testcase.lvlib" Type="Library" URL="../CSM/CSM-Testcase.lvlib"/>
+			<Item Name="Build CSM to PPL.vi" Type="VI" URL="../CSM/Build CSM to PPL.vi"/>
+			<Item Name="InitCSMs.vi" Type="VI" URL="../CSM/InitCSMs.vi"/>
+			<Item Name="Prototypes.vi" Type="VI" URL="../CSM/Prototypes.vi"/>
+			<Item Name="StartCSMs.vi" Type="VI" URL="../CSM/StartCSMs.vi"/>
+			<Item Name="GetPathByPrototypeName.vi" Type="VI" URL="../CSM/GetPathByPrototypeName.vi"/>
+			<Item Name="InitCSMs(backup).vi" Type="VI" URL="../CSM/InitCSMs(backup).vi"/>
+		</Item>
 		<Item Name="testcase-CSMSystemLevelModule.lvclass" Type="LVClass" URL="../testcase-CSMSystemLevelModule/testcase-CSMSystemLevelModule.lvclass"/>
 		<Item Name="testcase-CSMNonCSMCallerSupportAPI.lvclass" Type="LVClass" URL="../testcase-CSMNonCSMCallerSupportAPI/testcase-CSMNonCSMCallerSupportAPI.lvclass"/>
 		<Item Name="testcase-CSMManagementAPI.lvclass" Type="LVClass" URL="../testcase-CSMManagementAPI/testcase-CSMManagementAPI.lvclass"/>
@@ -361,19 +369,23 @@
 				<Item Name="NI_FileType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/lvfile.llb/NI_FileType.lvlib"/>
 				<Item Name="Check if File or Folder Exists.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Check if File or Folder Exists.vi"/>
 				<Item Name="NI_PackedLibraryUtility.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/LVLibp/NI_PackedLibraryUtility.lvlib"/>
+				<Item Name="imagedata.ctl" Type="VI" URL="/&lt;vilib&gt;/picture/picture.llb/imagedata.ctl"/>
+				<Item Name="8.6CompatibleGlobalVar.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/config.llb/8.6CompatibleGlobalVar.vi"/>
+				<Item Name="NI_LVConfig.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/config.llb/NI_LVConfig.lvlib"/>
+				<Item Name="Space Constant.vi" Type="VI" URL="/&lt;vilib&gt;/dlg_ctls.llb/Space Constant.vi"/>
 				<Item Name="Parse State Queue__JKI_lib_State_Machine.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/State Machine/_JKI_lib_State_Machine.llb/Parse State Queue__JKI_lib_State_Machine.vi"/>
 				<Item Name="TRef TravTarget.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/traverseref.llb/TRef TravTarget.ctl"/>
 				<Item Name="VI Scripting - Traverse.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/traverseref.llb/VI Scripting - Traverse.lvlib"/>
 				<Item Name="LVPositionTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVPositionTypeDef.ctl"/>
 				<Item Name="LVDeltaXY32Cluster.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVDeltaXY32Cluster.ctl"/>
 				<Item Name="LVPointTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVPointTypeDef.ctl"/>
-				<Item Name="NI_LVConfig.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/config.llb/NI_LVConfig.lvlib"/>
-				<Item Name="Space Constant.vi" Type="VI" URL="/&lt;vilib&gt;/dlg_ctls.llb/Space Constant.vi"/>
-				<Item Name="8.6CompatibleGlobalVar.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/config.llb/8.6CompatibleGlobalVar.vi"/>
 				<Item Name="Draw Flattened Pixmap.vi" Type="VI" URL="/&lt;vilib&gt;/picture/picture.llb/Draw Flattened Pixmap.vi"/>
-				<Item Name="imagedata.ctl" Type="VI" URL="/&lt;vilib&gt;/picture/picture.llb/imagedata.ctl"/>
 				<Item Name="FixBadRect.vi" Type="VI" URL="/&lt;vilib&gt;/picture/pictutil.llb/FixBadRect.vi"/>
 				<Item Name="RectSize.vi" Type="VI" URL="/&lt;vilib&gt;/picture/PictureSupport.llb/RectSize.vi"/>
+				<Item Name="Point2Rect.vi" Type="VI" URL="/&lt;vilib&gt;/picture/PictureSupport.llb/Point2Rect.vi"/>
+				<Item Name="PointInRect.vi" Type="VI" URL="/&lt;vilib&gt;/picture/PictureSupport.llb/PointInRect.vi"/>
+				<Item Name="InsetRect.vi" Type="VI" URL="/&lt;vilib&gt;/picture/PictureSupport.llb/InsetRect.vi"/>
+				<Item Name="RectCentroid.vi" Type="VI" URL="/&lt;vilib&gt;/picture/PictureSupport.llb/RectCentroid.vi"/>
 				<Item Name="Compare Two Paths.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Compare Two Paths.vi"/>
 				<Item Name="Simple Error Handler.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Simple Error Handler.vi"/>
 				<Item Name="TRef Traverse.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/traverseref.llb/TRef Traverse.vi"/>
@@ -382,9 +394,11 @@
 			<Item Name="Communicable State Machine.lvlib" Type="Library" URL="../../src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/Communicable State Machine.lvlib"/>
 			<Item Name="CSM Shared.lvlib" Type="Library" URL="../../src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/_Shared/CSM Shared.lvlib"/>
 			<Item Name="CSM Loop Support.lvlib" Type="Library" URL="../../src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/addons/Loop-Support/CSM Loop Support.lvlib"/>
-			<Item Name="Generate testcase Started User Log.vi" Type="VI" URL="../_previous/_support/Generate testcase Started User Log.vi"/>
 			<Item Name="CSM Attributes API(VIM).lvlib" Type="Library" URL="../../src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/addons/AttributesVIM/CSM Attributes API(VIM).lvlib"/>
 			<Item Name="CSM File Logger.lvlib" Type="Library" URL="../../src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/addons/Logger/CSM File Logger.lvlib"/>
+			<Item Name="Generate testcase Started User Log.vi" Type="VI" URL="../_support/Generate testcase Started User Log.vi"/>
+			<Item Name="Check CSM Modules Exist Or Not.vi" Type="VI" URL="../_support/Check CSM Modules Exist Or Not.vi"/>
+			<Item Name="Package Error Info.vi" Type="VI" URL="../_support/Package Error Info.vi"/>
 			<Item Name="DebugConsole.lvlib" Type="Library" URL="../../src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/_tool/_debugConsole/DebugConsole.lvlib"/>
 			<Item Name="_csmlite.lvlib" Type="Library" URL="../../src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/_tool/_csmlite/_csmlite.lvlib"/>
 			<Item Name="CSM-Helper API with lvcsm Support.lvlib" Type="Library" URL="../../src/user.lib/_NEVSTOP/Communicable State Machine(CSM)/_csmHelper/API with lvcsm Support/CSM-Helper API with lvcsm Support.lvlib"/>
@@ -413,7 +427,7 @@
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToProject</Property>
 				<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{A89D9A51-BD9C-4565-8F45-AD1D68D344FD}</Property>
-				<Property Name="Bld_version.build" Type="Int">346</Property>
+				<Property Name="Bld_version.build" Type="Int">349</Property>
 				<Property Name="Bld_version.major" Type="Int">1</Property>
 				<Property Name="Destination[0].destName" Type="Str">CSM-Testcase.lvlibp</Property>
 				<Property Name="Destination[0].path" Type="Path">../CSM/CSM-Testcase.lvlibp</Property>
@@ -428,7 +442,7 @@
 				<Property Name="Source[0].itemID" Type="Str">{8ACD2EE0-7F2A-4DDF-9C13-67BB3F9ECC94}</Property>
 				<Property Name="Source[0].type" Type="Str">Container</Property>
 				<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
-				<Property Name="Source[1].itemID" Type="Ref">/My Computer/CSM-Testcase.lvlib</Property>
+				<Property Name="Source[1].itemID" Type="Ref">/My Computer/CSM/CSM-Testcase.lvlib</Property>
 				<Property Name="Source[1].Library.allowMissingMembers" Type="Bool">true</Property>
 				<Property Name="Source[1].Library.atomicCopy" Type="Bool">true</Property>
 				<Property Name="Source[1].Library.LVLIBPtopLevel" Type="Bool">true</Property>
@@ -454,7 +468,7 @@
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToProject</Property>
 				<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{DF3A8CD5-4937-4FE8-B30A-163F6FCA54B2}</Property>
-				<Property Name="Bld_version.build" Type="Int">311</Property>
+				<Property Name="Bld_version.build" Type="Int">313</Property>
 				<Property Name="Bld_version.major" Type="Int">1</Property>
 				<Property Name="Destination[0].destName" Type="Str">CSM-Testcase2.lvlibp</Property>
 				<Property Name="Destination[0].path" Type="Path">../CSM/CSM-Testcase2.lvlibp</Property>
@@ -469,7 +483,7 @@
 				<Property Name="Source[0].itemID" Type="Str">{91CC6082-CCFF-40D6-836F-F2075D5067B7}</Property>
 				<Property Name="Source[0].type" Type="Str">Container</Property>
 				<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
-				<Property Name="Source[1].itemID" Type="Ref">/My Computer/CSM-Testcase.lvlib</Property>
+				<Property Name="Source[1].itemID" Type="Ref">/My Computer/CSM/CSM-Testcase.lvlib</Property>
 				<Property Name="Source[1].Library.allowMissingMembers" Type="Bool">true</Property>
 				<Property Name="Source[1].Library.atomicCopy" Type="Bool">true</Property>
 				<Property Name="Source[1].Library.LVLIBPtopLevel" Type="Bool">true</Property>

diff --git a/testcases/CSM/Build CSM to PPL.vi b/testcases/CSM/Build CSM to PPL.vi
diff --git a/testcases/CSM/CSM-Testcase.lvlib b/testcases/CSM/CSM-Testcase.lvlib
@@ -12,5 +12,4 @@
 	<Item Name="Chain5.vi" Type="VI" URL="../Chain5.vi"/>
 	<Item Name="Chain6.vi" Type="VI" URL="../Chain6.vi"/>
 	<Item Name="Normal-CSM.vi" Type="VI" URL="../Normal-CSM.vi"/>
-	<Item Name="InitCSMs.vi" Type="VI" URL="../InitCSMs.vi"/>
 </Library>
diff --git a/testcases/CSM/Chain4.vi b/testcases/CSM/Chain4.vi
diff --git a/testcases/CSM/Chain6.vi b/testcases/CSM/Chain6.vi
diff --git a/testcases/CSM/GetPathByPrototypeName.vi b/testcases/CSM/GetPathByPrototypeName.vi
diff --git a/testcases/CSM/InitCSMs(backup).vi b/testcases/CSM/InitCSMs(backup).vi
diff --git a/testcases/CSM/InitCSMs.vi b/testcases/CSM/InitCSMs.vi
diff --git a/testcases/CSM/Normal-CSM.vi b/testcases/CSM/Normal-CSM.vi
diff --git a/testcases/CSM/Prototypes.vi b/testcases/CSM/Prototypes.vi
diff --git a/testcases/CSM/StartCSMs.vi b/testcases/CSM/StartCSMs.vi
diff --git a/testcases/CSMTestSuite/New.vi b/testcases/CSMTestSuite/New.vi
diff --git a/testcases/CSMTestSuite/setUp.vi b/testcases/CSMTestSuite/setUp.vi
diff --git a/testcases/testcase-CSMBroadcast/InitCSMs.vi b/testcases/testcase-CSMBroadcast/InitCSMs.vi
diff --git a/testcases/testcase-CSMBroadcast/globalSetUp.vi b/testcases/testcase-CSMBroadcast/globalSetUp.vi
diff --git a/testcases/testcase-CSMBroadcast/test1-LocalExternalStatusRegistration.vi b/testcases/testcase-CSMBroadcast/test1-LocalExternalStatusRegistration.vi
diff --git a/testcases/testcase-CSMBroadcast/test19-1ToNInterruptStatus.vi b/testcases/testcase-CSMBroadcast/test19-1ToNInterruptStatus.vi
diff --git a/testcases/testcase-CSMBroadcast/test20-RegisterStatusAsInterruptFromNonCSM.vi b/testcases/testcase-CSMBroadcast/test20-RegisterStatusAsInterruptFromNonCSM.vi
diff --git a/testcases/testcase-CSMBroadcast/test21-RegisterInterruptFromNonCSM.vi b/testcases/testcase-CSMBroadcast/test21-RegisterInterruptFromNonCSM.vi
diff --git a/testcases/testcase-CSMBroadcast/test22-RegisterInterruptAsStatusFromNonCSM.vi b/testcases/testcase-CSMBroadcast/test22-RegisterInterruptAsStatusFromNonCSM.vi
diff --git a/testcases/testcase-CSMBroadcast/test23-RegisterStatusAsInterruptFromNonCSM_State.vi b/testcases/testcase-CSMBroadcast/test23-RegisterStatusAsInterruptFromNonCSM_State.vi
diff --git a/testcases/testcase-CSMBroadcast/test24-MappingRelationshipByExternalRegistration_API.vi b/testcases/testcase-CSMBroadcast/test24-MappingRelationshipByExternalRegistration_API.vi
diff --git a/testcases/testcase-CSMBroadcast/test25-MappingRelationshipByExternalRegistration.vi b/testcases/testcase-CSMBroadcast/test25-MappingRelationshipByExternalRegistration.vi
diff --git a/.../testcase-CSMBroadcast/test26-MappingRelationshipByLocalRegistration_WithSubcriberName.vi b/.../testcase-CSMBroadcast/test26-MappingRelationshipByLocalRegistration_WithSubcriberName.vi
diff --git a/...stcase-CSMBroadcast/test27-MappingRelationshipByLocalRegistration_WithoutSubcriberName.vi b/...stcase-CSMBroadcast/test27-MappingRelationshipByLocalRegistration_WithoutSubcriberName.vi
diff --git a/...cases/testcase-CSMBroadcast/test28-MappingRelationshipByExternalRegistration_API_State.vi b/...cases/testcase-CSMBroadcast/test28-MappingRelationshipByExternalRegistration_API_State.vi
diff --git a/testcases/testcase-CSMBroadcast/test29-MappingRelationshipByExternalRegistration_State.vi b/testcases/testcase-CSMBroadcast/test29-MappingRelationshipByExternalRegistration_State.vi
diff --git a/...se-CSMBroadcast/test30-MappingRelationshipByLocalRegistration_WIthSubscriberName_State.vi b/...se-CSMBroadcast/test30-MappingRelationshipByLocalRegistration_WIthSubscriberName_State.vi
diff --git a/...CSMBroadcast/test31-MappingRelationshipByLocalRegistration_WIthoutSubscriberName_State.vi b/...CSMBroadcast/test31-MappingRelationshipByLocalRegistration_WIthoutSubscriberName_State.vi
diff --git a/testcases/testcase-CSMBroadcast/test8-LocalExternalStateRegistration.vi b/testcases/testcase-CSMBroadcast/test8-LocalExternalStateRegistration.vi