grid doc update
Merge remote-tracking branch 'origin/codename-h' into codename-h