Merge "LegacySupport: include interface name in errors"