Merge "Adding missing dependencies batch 9" into tm-dev