DO NOT MERGE Add ability to add interop entries dynamically (1/2) am: 0a778c30fd am: edbcc9a862
am: 4b29fd8b03  -s ours

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