Merge "Move kind as root"