Fix namespace collision
Merge remote-tracking branch 'origin'