Merge "Update references to ike stubs" into rvc-dev