change create session method
Merge branch 'development' into stage
Merge branch 'stage'