Merged changes for InspectionObject

Merged changes for InspectionObject with UserService