BTE-25 upgrade to Scala 2.10