Merge "Use correct UID when checking for renounced" into tm-dev