diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 026618088c..b76a33db3e 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -182,8 +182,11 @@
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
 				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="content"/>
 				<data android:scheme="file"/>
+				<data android:scheme="data"/>
 				<data android:host="*"/>
+				<data android:mimeType="*/*"/>
 				<data android:pathPattern=".*\\.kmz" />
 				<data android:pathPattern=".*\\..*\\.kmz" />
 				<data android:pathPattern=".*\\..*\\..*\\.kmz" />
diff --git a/OsmAnd/assets/bundled_assets.xml b/OsmAnd/assets/bundled_assets.xml
index f310f26820..9bdaf89662 100644
--- a/OsmAnd/assets/bundled_assets.xml
+++ b/OsmAnd/assets/bundled_assets.xml
@@ -21,6 +21,7 @@
 	<asset source="voice/fa/fa_tts.js" destination="voice/fa-tts/fa_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/fi/fi_tts.js" destination="voice/fi-tts/fi_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/fr/fr_tts.js" destination="voice/fr-tts/fr_tts.js" mode="alwaysOverwriteOrCopy" />
+	<asset source="voice/gn-py/gn-py_tts.js" destination="voice/gn-py-tts/gn-py_tts.js" mode="overwriteOnlyIfExists" />
 	<!--<asset source="voice/he/he_tts.js" destination="voice/he-tts/he_tts.js" mode="overwriteOnlyIfExists" />-->
 	<asset source="voice/nb/nb_tts.js" destination="voice/nb-tts/nb_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/hi/hi_tts.js" destination="voice/hi-tts/hi_tts.js" mode="overwriteOnlyIfExists" />
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 7cc362c196..47e5cf8f0c 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1511,6 +1511,7 @@
     <string name="lang_uk">Ukrainian</string>
     <string name="lang_vi">Vietnamese</string>
     <string name="lang_cy">Welsh</string>
+    <string name="lang_gn_py">Guaraní</string>
     <string name="index_name_canada">North America - Canada</string>
     <string name="index_name_italy">Europe - Italy</string>
     <string name="index_name_gb">Europe - Great Britain</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java b/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
index d49079edd0..900cb464da 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
@@ -35,7 +35,9 @@ public class StartGPSStatus extends OsmAndAction {
 		GPS_TEST("GPS Test", "com.chartcross.gpstest", "com.chartcross.gpstestplus", ""),
 		INVIU_GPS("inViu GPS-details ", "de.enaikoon.android.inviu.gpsdetails", "", ""),
 		ANDROI_TS_GPS_TEST("AndroiTS GPS Test", "com.androits.gps.test.free", "com.androits.gps.test.pro", ""),
-		SAT_STAT("SatStat (F-droid)", "com.vonglasow.michael.satstat", "", "");
+		SAT_STAT("SatStat (F-droid)", "com.vonglasow.michael.satstat", "", ""),
+		GPSTESTSS("GPSTest (F-droid)", "com.android.gpstest", "", "");
+
 		
 		public final String stringRes;
 		public final String appName;
diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index e655960eea..4e3fa2093e 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -239,7 +239,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 	}
 
 	public static boolean isSmallSpeedForDirectionOfMovement(Location location, float speedToDirectionOfMovement) {
-		return !location.hasSpeed() || location.getSpeed() < speedToDirectionOfMovement;
+		return !location.hasSpeed() || location.getSpeed()* 3.6 < speedToDirectionOfMovement;
 	}
 
 	public static boolean isSmallSpeedForCompass(Location location) {
diff --git a/OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java b/OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java
index b9df08a3ba..f6fd3b8cf7 100644
--- a/OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java
+++ b/OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java
@@ -591,10 +591,15 @@ public class TurnPathHelper {
 			}
 		} else if (turnIndex == SECOND_TURN) {
 			if (TurnType.isLeftTurn(firstTurnType) && TurnType.isLeftTurn(secondTurnType)) {
-				turnResource = null;
+				if(TurnType.isSlightTurn(firstTurnType))
+					turnResource = new TurnResource(secondTurnType, true, false, leftSide);
+				else turnResource = null;
 			} else if (TurnType.isRightTurn(firstTurnType) && TurnType.isRightTurn(secondTurnType)) {
-				turnResource = null;
-			} else if (firstTurnType == TurnType.C || thirdTurnType == TurnType.C) {
+				if(TurnType.isSlightTurn(firstTurnType))
+					turnResource = new TurnResource(secondTurnType, true, false, leftSide);
+				else turnResource = null;
+			} else
+				if (firstTurnType == TurnType.C || thirdTurnType == TurnType.C) {
 				// get the small one
 				turnResource = new TurnResource(secondTurnType, true, false, leftSide);
 			} else {