Drop support for ExtendedAttributeTypePair
auto-merge staging into master