Merge "explicit 'user root'" into main