Merge "Simplify and tidy the API for maximum value support."