Merge "Cleanup tapl test workaround" into tm-dev