PROBCORE-236 Working on StateInspector