Merge "Fix mismatch in the REQUIRED_(NOT_)FEATURE_ATTR ids"