Merge "Avoid callback promotion in set" into tm-dev