PROBCORE-546 Got rid of a lot of unnecessary proof classes.
Merge remote-tracking branch 'origin/develop' into develop