diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79f872f..f0d3bb0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,8 +38,29 @@ jobs:
           cache: 'gradle'
 
       - name: Build core and compose locally
+        env:
+          HEAD_REF: ${{ github.head_ref }}
         run: |
-          git clone --depth 1 https://github.com/MapConductor/android-sdk-core.git _core
+          # コア側に PR と同名のブランチがあるなら、そちらを組む。
+          #
+          # ここを default ブランチ固定にしていると、**コアの未マージな変更に追随する
+          # PR は永久に赤いまま**になる。実際 CameraBearing をコアへ足したとき、
+          # プロバイダ側の PR が 10 本まとめて Unresolved reference で落ちた。
+          # コアが先にマージされるまで待つ、という運用は取り込み順の事故を呼ぶので、
+          # 同名ブランチがあれば拾う形にしてある（無ければ従来どおり default）。
+          clone_matching() {
+            repo="$1"; dir="$2"
+            url="https://github.com/MapConductor/$repo.git"
+            if [ -n "$HEAD_REF" ] && git ls-remote --exit-code --heads "$url" "$HEAD_REF" >/dev/null 2>&1; then
+              echo "$repo: matching branch $HEAD_REF"
+              git clone --depth 1 --branch "$HEAD_REF" "$url" "$dir"
+            else
+              echo "$repo: default branch"
+              git clone --depth 1 "$url" "$dir"
+            fi
+          }
+
+          clone_matching android-sdk-core _core
           cd _core
           ./gradlew --no-daemon publishToMavenLocal
           cd ..
@@ -53,7 +74,7 @@ jobs:
           }
           EOF
 
-          git clone --depth 1 https://github.com/MapConductor/android-sdk-compose.git _compose
+          clone_matching android-sdk-compose _compose
           cd _compose
           ./gradlew --no-daemon publishToMavenLocal
           cd ..
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5e2b5b2..9b8add3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,8 @@
 [versions]
 composeLibs = "1.7.8"
+# material3 は compose-ui とは別のバージョン系列。composeLibs（ui 系）を流用すると
+# 存在しない material3:1.7.8 を要求してクラスパスごと解決に失敗する。
+material3 = "1.4.0"
 coroutines = "1.9.0"
 agp = "9.2.1"
 kotlin = "2.0.21"
@@ -35,7 +38,10 @@ play-services-maps = { module = "com.google.android.gms:play-services-maps", ver
 
 # Sample app
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
-androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "composeLibs" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
+# sample-app が Icons.AutoMirrored を使う。material3 は material-icons を推移的に持ってこないので
+# 明示的に足す。版は compose BOM 任せ（集約ビルドの catalog と同じ形）。
+androidx-material-icons-core = { group = "androidx.compose.material", name = "material-icons-core" }
 androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "composeLibs" }
 
 # Test
diff --git a/sample-app/build.gradle.kts b/sample-app/build.gradle.kts
index bd12482..55a8249 100644
--- a/sample-app/build.gradle.kts
+++ b/sample-app/build.gradle.kts
@@ -57,6 +57,7 @@ dependencies {
     implementation(libs.androidx.ui)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.material.icons.core)
     debugImplementation(platform(libs.androidx.compose.bom))
     debugImplementation(libs.androidx.ui.tooling)
 }
diff --git a/src/main/java/com/mapconductor/googlemaps/MapCameraPosition.kt b/src/main/java/com/mapconductor/googlemaps/MapCameraPosition.kt
index 2f867cc..c7b2dc2 100644
--- a/src/main/java/com/mapconductor/googlemaps/MapCameraPosition.kt
+++ b/src/main/java/com/mapconductor/googlemaps/MapCameraPosition.kt
@@ -2,6 +2,7 @@ package com.mapconductor.googlemaps
 
 import com.google.android.gms.maps.model.CameraPosition
 import com.mapconductor.core.features.GeoPoint
+import com.mapconductor.core.map.CameraBearing
 import com.mapconductor.core.map.MapCameraPosition
 import com.mapconductor.core.map.MapCameraPositionInterface
 import com.mapconductor.core.map.MapPaddings
@@ -22,7 +23,7 @@ fun MapCameraPosition.toCameraPosition(): CameraPosition {
             .target(GeoPoint.from(position).toLatLng())
             .zoom(zoom.toFloat())
             .tilt(tilt.coerceIn(0.0, 60.0).toFloat())
-            .bearing(bearing.toFloat())
+            .bearing(CameraBearing.toNativeHeading(bearing).toFloat())
             .build()
     } else {
         // tilt < 0: 水平線より abs(tilt) 度上方を向く（仰角ビュー）
@@ -33,7 +34,7 @@ fun MapCameraPosition.toCameraPosition(): CameraPosition {
         val tiltAbsRad = Math.toRadians(tiltAbsDeg)
         val altitude = converter.zoomLevelToAltitude(zoom, position.latitude, 0.0)
         val distanceForward = altitude * tan(tiltAbsRad)
-        val target = Spherical.computeOffset(position, distanceForward, bearing)
+        val target = Spherical.computeOffset(position, distanceForward, CameraBearing.toNativeHeading(bearing))
         val adjustedZoom = converter.altitudeToZoomLevel(altitude / cos(tiltAbsRad), target.latitude, 0.0)
 
         return CameraPosition
@@ -41,7 +42,7 @@ fun MapCameraPosition.toCameraPosition(): CameraPosition {
             .target(target.toLatLng())
             .zoom(adjustedZoom.toFloat())
             .tilt(tiltAbsDeg.toFloat())
-            .bearing(bearing.toFloat())
+            .bearing(CameraBearing.toNativeHeading(bearing).toFloat())
             .build()
     }
 }
@@ -71,7 +72,7 @@ fun CameraPosition.toMapCameraPosition(paddings: MapPaddingsInterface = MapPaddi
     return MapCameraPosition(
         position = position,
         zoom = zoom.toDouble(),
-        bearing = bearing.toDouble(),
+        bearing = CameraBearing.bearingFromNativeHeading(bearing.toDouble()),
         tilt = tilt.toDouble(),
         paddings = paddings,
         visibleRegion = null,