Fix: Remove zoneID from userID field
Merge branch 'development'