Merge "API: Abstract out parameter validation"