Merge "Incorporate API feedback: extract text accessories" into tm-dev