simplifying
Merge branch 'dev' into session