Merge "Check if package is null for uid" into tm-dev