Merge "Fix Incorrect Trust Agent Count" into tm-qpr-dev