Merge change Id9fcfa6d

* changes:
  Fix for inline string indexof; added regression tests