Merge remote-tracking branch 'ummeegge/useragent' into next