Merge "Adding dependencies containing binary files" into tm-dev