Added stateless annotation
Merge remote-tracking branch 'origin/neha'