(bug 43541) Compatibility with foreign repositories

Change-Id: I649fc1f2c63223dc14a6d967d0b00b94355d4e1f