Merge "Follow up syntax improvement after mege" into tm-dev