Merged stml2 to trunk