DO NOT MERGE Add ability to add interop entries dynamically (1/2)
am: 0a778c30fd

* commit '0a778c30fd5625d6f584b71a636511621653a23c':
  DO NOT MERGE Add ability to add interop entries dynamically (1/2)