Merge "Remove more thin wrappers from the shared lib" into tm-qpr-dev