Merge "Update references to ike stubs"