diff --git a/scripts/IosSteps.txt b/scripts/IosSteps.txt
index d9259d9..b3a3f4b 100644
--- a/scripts/IosSteps.txt
+++ b/scripts/IosSteps.txt
@@ -12,5 +12,5 @@ sh cp -a BuildSample/BuildSample/Output/ Output/Appstore/
 
 publish 'Output/Appstore/Artifacts/BuildSample-{@version}.ipa' to testflight notes = 'Hello' api_token = '{@tf_api_token}' team_token = '{@tf_team_token}'
 
-restore from backup
-delete backup
\ No newline at end of file
+restore from backup 'BuildSample'
+delete backup 'BuildSample'
\ No newline at end of file
diff --git a/scripts/TouchinBuild/Core/DependencyResolver/SettingsResolver.py b/scripts/TouchinBuild/Core/DependencyResolver/SettingsResolver.py
index 3b3c50f..901f3d7 100644
--- a/scripts/TouchinBuild/Core/DependencyResolver/SettingsResolver.py
+++ b/scripts/TouchinBuild/Core/DependencyResolver/SettingsResolver.py
@@ -55,6 +55,6 @@ class SettingsResolver:
 
 		for node in resolvedDependencies:
 			unresolvedSettingValue = self.settings[node.name]
-			resolvedSettingValue = macroResolver.processText(unresolvedSettingValue)
+			resolvedSettingValue = macroResolver.processText(unresolvedSettingValue, None)
 
 			self.settings[node.name] = resolvedSettingValue
\ No newline at end of file
diff --git a/scripts/TouchinBuild/Core/LineConveyor/CommentRemover.py b/scripts/TouchinBuild/Core/LineConveyor/CommentRemover.py
index 568d46b..7dcb8c1 100644
--- a/scripts/TouchinBuild/Core/LineConveyor/CommentRemover.py
+++ b/scripts/TouchinBuild/Core/LineConveyor/CommentRemover.py
@@ -2,7 +2,7 @@ class CommentRemover:
 	def __init__(self):
 		pass
 
-	def processText(self, line):
+	def processText(self, line, conveyorProcessor):
 		assert line is not None
 
 		newLine = line
diff --git a/scripts/TouchinBuild/Core/LineConveyor/MacroResolver.py b/scripts/TouchinBuild/Core/LineConveyor/MacroResolver.py
index eeeb8bc..0012c09 100644
--- a/scripts/TouchinBuild/Core/LineConveyor/MacroResolver.py
+++ b/scripts/TouchinBuild/Core/LineConveyor/MacroResolver.py
@@ -6,7 +6,7 @@ class MacroResolver:
 		self.macroProcessor = macroProcessor
 		self.valueProvider = valueProvider
 
-	def processText(self, line):
+	def processText(self, line, conveyorProcessor):
 		assert line is not None
 
 		symbols = self.macroProcessor.getSymbols(line)
diff --git a/scripts/TouchinBuild/Core/LineConveyor/Stripper.py b/scripts/TouchinBuild/Core/LineConveyor/Stripper.py
index 22c6d5c..8aff211 100644
--- a/scripts/TouchinBuild/Core/LineConveyor/Stripper.py
+++ b/scripts/TouchinBuild/Core/LineConveyor/Stripper.py
@@ -2,7 +2,7 @@ class Stripper:
 	def __init__(self):
 		pass
 
-	def processText(self, line):
+	def processText(self, line, conveyorProcessor):
 		assert line is not None
 
 		return line.strip(' \t\n\r')
diff --git a/scripts/TouchinBuild/Core/LineConveyor/TextConveyorPreprocessor.py b/scripts/TouchinBuild/Core/LineConveyor/TextConveyorPreprocessor.py
index a474a80..9f789b4 100644
--- a/scripts/TouchinBuild/Core/LineConveyor/TextConveyorPreprocessor.py
+++ b/scripts/TouchinBuild/Core/LineConveyor/TextConveyorPreprocessor.py
@@ -7,10 +7,10 @@ class TextConveyorPreprocessor:
 
 		self.processors.append(processor)
 
-	def processText(self, text):
+	def processText(self, text, conveyorProcessor):
 		assert text is not None
 
 		for processor in self.processors:
-			text = processor.processText(text)
+			text = processor.processText(text, conveyorProcessor)
 
 		return text
diff --git a/scripts/TouchinBuild/Core/LineConveyor/TextInclude.py b/scripts/TouchinBuild/Core/LineConveyor/TextInclude.py
index b45446d..144eea8 100644
--- a/scripts/TouchinBuild/Core/LineConveyor/TextInclude.py
+++ b/scripts/TouchinBuild/Core/LineConveyor/TextInclude.py
@@ -6,7 +6,7 @@ class TextInclude:
 		self.includeProcessor = includeProcessor
 		self.contentProvider = contentProvider
 
-	def processText(self, text):
+	def processText(self, text, conveyorProcessor):
 		assert text is not None
 		includesInfo = self.includeProcessor.getIncludesInfo(text)
 
@@ -15,6 +15,8 @@ class TextInclude:
 			path = info[1]
 
 			content = self.contentProvider.fetchContent(path)
+			content = conveyorProcessor.processText(content, conveyorProcessor)
+
 			text = text.replace(includeStatement, content)
 
 		return text
\ No newline at end of file
diff --git a/scripts/TouchinBuild/Core/StepsRunner.py b/scripts/TouchinBuild/Core/StepsRunner.py
index 4883959..39ae070 100644
--- a/scripts/TouchinBuild/Core/StepsRunner.py
+++ b/scripts/TouchinBuild/Core/StepsRunner.py
@@ -42,7 +42,7 @@ class StepsRunner:
 
 		lines = content.splitlines()
 		for line in lines:
-			processedLine = self.lineConveyor.processText(line)
+			processedLine = self.lineConveyor.processText(line, self.lineConveyor)
 
 			if len(processedLine) == 0:
 				continue
diff --git a/scripts/TouchinBuild/taskRunner.py b/scripts/TouchinBuild/taskRunner.py
index 8fdbf27..5fcc12a 100755
--- a/scripts/TouchinBuild/taskRunner.py
+++ b/scripts/TouchinBuild/taskRunner.py
@@ -73,7 +73,7 @@ class TaskRunner:
 		pathToSteps = config['steps']
 
 		content = self.fileContentProvider.fetchContent(pathToSteps)
-		content = self.textPreprocessor.processText(content)
+		content = self.textPreprocessor.processText(content, self.textPreprocessor)
 
 		return content