session safe manage
merge dev session safe manage