Merge "Remove unnecessary async" into tm-dev