Merge "Fix enterprise resources ID typos" into tm-dev