Fixed #22030 -- Don't assume that all fields have a swappable_setting attribute.
Merge pull request #2270 from bmispelon/ticket-22030

Fixed #22030 -- Don't assume that all fields have a swappable_setting at...