PROBCORE-504 PROBCORE-509 Rewrote class for persistency. Fixed Persistency for state view.
Merge remote-tracking branch 'origin/develop' into develop