Merge change 6122

* changes:
  Add mterp stub collection to aid porting.