Merge "Add more info to GetSFields DCHECK"