Merge "DO NOT MERGE - Backport master API changes" into tm-qpr-dev