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

* commit 'b4982aab07ae4cdaba13b4cb99306459d92e52d5':
  Improved instruction + offset hunting.