staging merge
fixed raven session issue