Merge branch 'dev'
Check null session on Activity result
Merge branch 'dev'