Merge changes Icc7da602,Id166bd8a

* changes:
  Remove last remnants of obj_int_extract
  Initialize "corrupted" to zero