Merge "1b/ Replace removed shared lib calls with direct calls" into tm-dev