Merge "Fix duplicate permission privilege escalation" into tm-dev