Api v7

The master should be the api_v7 + trunk development