diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
index b3bd534458..612ce25fec 100644
--- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
+++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala
@@ -12,7 +12,6 @@ import akka.actor.Deploy
 import akka.actor.Props
 import akka.actor.Terminated
 import akka.cluster.sharding.Shard.ShardCommand
-import akka.persistence._
 import akka.actor.Actor
 
 import akka.util.MessageBufferMap
@@ -24,6 +23,16 @@ import akka.cluster.ddata.ORSetKey
 import akka.cluster.ddata.Replicator._
 import akka.actor.Stash
 import akka.cluster.ddata.DistributedData
+import akka.persistence.PersistentActor
+import akka.persistence.SnapshotOffer
+import akka.persistence.SaveSnapshotSuccess
+import akka.persistence.DeleteSnapshotFailure
+import akka.persistence.DeleteMessagesSuccess
+import akka.persistence.SaveSnapshotFailure
+import akka.persistence.DeleteMessagesFailure
+import akka.persistence.DeleteSnapshotSuccess
+import akka.persistence.SnapshotSelectionCriteria
+import akka.persistence.RecoveryCompleted
 
 /**
  * INTERNAL API
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 0e5dc88a38..3510feae3f 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -20,7 +20,7 @@ object Dependencies {
   val aeronVersion = "1.2.5"
 
   val Versions = Seq(
-    crossScalaVersions := Seq("2.11.8", "2.12.1"),
+    crossScalaVersions := Seq("2.11.11", "2.12.2"),
     scalaVersion := System.getProperty("akka.build.scalaVersion", crossScalaVersions.value.head),
     scalaStmVersion := sys.props.get("akka.build.scalaStmVersion").getOrElse("0.8"),
     scalaCheckVersion := sys.props.get("akka.build.scalaCheckVersion").getOrElse(
diff --git a/project/MiMa.scala b/project/MiMa.scala
index 6dc9d6d5ba..04870af0fb 100644
--- a/project/MiMa.scala
+++ b/project/MiMa.scala
@@ -1174,6 +1174,15 @@ object MiMa extends AutoPlugin {
           ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.ddata.LmdbDurableStore.valueBuffer_="),
           ProblemFilters.exclude[DirectMissingMethodProblem]("akka.cluster.ddata.LmdbDurableStore.valueBuffer"),
           
+          ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.stream.scaladsl.FlowOps.groupedWeightedWithin"),
+          ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.io.FileSubscriber.props"),
+          ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.io.FileSource.this"),
+          ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.io.FileSink.this"),
+          ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.io.FilePublisher.props"),
+          ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.io.FileSubscriber.this"),
+          ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.io.FilePublisher.this"),
+          ProblemFilters.exclude[MissingClassProblem]("akka.stream.impl.fusing.GroupedWithin"),
+          
           ProblemFilters.exclude[InheritedNewAbstractMethodProblem]("akka.stream.Graph.traversalBuilder"),
           ProblemFilters.exclude[InheritedNewAbstractMethodProblem]("akka.stream.Graph.named"),
           ProblemFilters.exclude[InheritedNewAbstractMethodProblem]("akka.stream.Graph.addAttributes"),