Merge remote-tracking branch 'osmlab/id-default'