Update to #1659: Handle Grid settings