log warning on bad uid encoding
Merge remote-tracking branch 'origin/master'