Aligned to Sesame 2.1.13