Merged changes from Piero into the changes for the InspectionObject controller