Merge "Add ability to add interop entries dynamically (1/2)"