Upgrade interfaces to be compatible with v5 and later
Upgrade interfaces to be compatible with v5 and later