--MTE-16, merged 1.2beta branch to master