updated session serializer
merge master