Merge "Fixing issues with idmanager Adding if-index support for interfacemanager"