Add ability to add interop entries dynamically (1/2)
am: b245a8237a

* commit 'b245a8237a313683bf2981ba0a764b57f5a41f08':
  Add ability to add interop entries dynamically (1/2)