Merge "Resolve API council feedback" into tm-dev