Merge "discovery: support large attributes (part 2)"