Updated texts
Merge branch 'api-1.1' into api-1.2