Merge branch 'stateless' into dev