[FIX] Remove unexpected keyword 'uid'
[MERGE] Merge from customer repository
[MERGE] Merge branch 'develop'