Uid not needed anymore
Merge remote-tracking branch 'origin/dev'