Fixed compatibility issues between this branch and gui
Merge branch 'feature-generic-inquisition' into develop