#268 and related issues with state merge instead of replace.
Merge branch 'master' of github.com:OOKB/rg-client-app