Merge "Add support for registering existing interfaces"