small refactor
add device cookie
small refactor
Merge branch 'feature/fixes' into develop