Stateless added
Merge branch 'web'