PROBCORE-236 Trying some things to make the state view look better
Merge remote-tracking branch 'origin/develop' into develop