Merge "Fix "already registered" error"