diff --git a/demo/ios/ForegroundApp/PicovoiceForegroundAppDemo.xcodeproj/xcshareddata/xcschemes/faDemo.xcscheme b/demo/ios/ForegroundApp/PicovoiceForegroundAppDemo.xcodeproj/xcshareddata/xcschemes/faDemo.xcscheme
new file mode 100644
index 000000000..dc7ddc152
--- /dev/null
+++ b/demo/ios/ForegroundApp/PicovoiceForegroundAppDemo.xcodeproj/xcshareddata/xcschemes/faDemo.xcscheme
@@ -0,0 +1,52 @@
+<?xml version="1.0" ?><Scheme LastUpgradeVersion="1310" version="1.7">
+   <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES">
+      <PreActions>
+         <ExecutionAction ActionType="Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent title="Run Script" scriptText="${SRCROOT}/pre-build.sh fa جوجه تیغی simple_context_fa">
+               <EnvironmentBuildable>
+                  <BuildableReference BuildableIdentifier="primary" BlueprintIdentifier="1760DF28253A175000395344" BuildableName="PicovoiceForegroundAppDemo.app" BlueprintName="PicovoiceForegroundAppDemo" ReferencedContainer="container:PicovoiceForegroundAppDemo.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
+      <BuildActionEntries>
+         <BuildActionEntry buildForTesting="YES" buildForRunning="YES" buildForProfiling="YES" buildForArchiving="YES" buildForAnalyzing="YES">
+            <BuildableReference BuildableIdentifier="primary" BlueprintIdentifier="1760DF28253A175000395344" BuildableName="PicovoiceForegroundAppDemo.app" BlueprintName="PicovoiceForegroundAppDemo" ReferencedContainer="container:PicovoiceForegroundAppDemo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction buildConfiguration="Debug" selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES">
+      <Testables>
+         <TestableReference skipped="NO">
+            <BuildableReference BuildableIdentifier="primary" BlueprintIdentifier="1E1A67BC26C4388300EDD6EC" BuildableName="PicovoiceForegroundAppDemoUITests.xctest" BlueprintName="PicovoiceForegroundAppDemoUITests" ReferencedContainer="container:PicovoiceForegroundAppDemo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction buildConfiguration="Debug" selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" useCustomWorkingDirectory="NO" ignoresPersistentStateOnLaunch="NO" debugDocumentVersioning="YES" debugServiceExtension="internal" allowLocationSimulation="YES">
+      <BuildableProductRunnable runnableDebuggingMode="0">
+         <BuildableReference BuildableIdentifier="primary" BlueprintIdentifier="1760DF28253A175000395344" BuildableName="PicovoiceForegroundAppDemo.app" BlueprintName="PicovoiceForegroundAppDemo" ReferencedContainer="container:PicovoiceForegroundAppDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable key="LANGUAGE" value="fa" isEnabled="YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable key="WAKEWORD" value="جوجه تیغی" isEnabled="YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable key="CONTEXT" value="simple_context_fa" isEnabled="YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction buildConfiguration="Release" shouldUseLaunchSchemeArgsEnv="YES" savedToolIdentifier="" useCustomWorkingDirectory="NO" debugDocumentVersioning="YES">
+      <BuildableProductRunnable runnableDebuggingMode="0">
+         <BuildableReference BuildableIdentifier="primary" BlueprintIdentifier="1760DF28253A175000395344" BuildableName="PicovoiceForegroundAppDemo.app" BlueprintName="PicovoiceForegroundAppDemo" ReferencedContainer="container:PicovoiceForegroundAppDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction buildConfiguration="Debug">
+   </AnalyzeAction>
+   <ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES">
+   </ArchiveAction>
+</Scheme>
\ No newline at end of file
diff --git a/resources/.test/test_data.json b/resources/.test/test_data.json
index 6aa95bbd9..54bc43adb 100644
--- a/resources/.test/test_data.json
+++ b/resources/.test/test_data.json
@@ -51,6 +51,18 @@
           }
         }
       },
+      {
+        "language": "fa",
+        "wakeword": "جوجه تیغی",
+        "context_name": "simple_context_fa",
+        "audio_file": "porcupine-simple-context_fa.wav",
+        "inference": {
+          "intent": "navigation",
+          "slots": {
+            "location": "آشپزخانه"
+          }
+        }
+      },
       {
         "language": "fr",
         "wakeword": "mon chouchou",
diff --git a/resources/audio_samples/porcupine-simple-context_fa.wav b/resources/audio_samples/porcupine-simple-context_fa.wav
new file mode 100644
index 000000000..4ed5c86d6
Binary files /dev/null and b/resources/audio_samples/porcupine-simple-context_fa.wav differ
diff --git a/resources/porcupine b/resources/porcupine
index f4d8fae70..79536f985 160000
--- a/resources/porcupine
+++ b/resources/porcupine
@@ -1 +1 @@
-Subproject commit f4d8fae708920cdc46b12cea7b485de21e537a2b
+Subproject commit 79536f9850f005f85347cb9ad5780c1bdb01aa39
diff --git a/resources/rhino b/resources/rhino
index fea6c1b03..396243383 160000
--- a/resources/rhino
+++ b/resources/rhino
@@ -1 +1 @@
-Subproject commit fea6c1b03b504100197ef4ecb8d5712c4ef176e0
+Subproject commit 3962433838c1f5d33c2d67aacd07b3bc2e0f01d1