Aligned to sesame 2.7.9 and spring 4.0.0