Merge "Add TRON counter for demo user creation"