PROBCORE-403 Created prototype for state view.
Merge remote-tracking branch 'origin/develop' into develop