Merge pull request #393 from krig/stateful
Low: Stateful: Clean up implementation of Stateful (bnc#867372)