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

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