Merge "Add composer API changes in accordance to partner feedback" into tm-dev