Aligned to Sesame 2.7.7