Merged stml2 addition to v1.70