Merge "Improved instruction + offset hunting." am: b4982aab07
am: 1d59f6f58d

* commit '1d59f6f58d1120214f6a72c96caf6d472a08d9d9':
  Improved instruction + offset hunting.