Merge remote-tracking branch 'osmlab/user-display'