bug fix on session __get
Merge branch 'dev' into base-build