merged from develop_scala-2.10