Merge "Ignore failing placeholder test" into tm-dev