Merge branch 'feature/inspectionTable' into dev