Issue #2858184 by tstoeckler, alexpott, amateescu: Adding NOT NULL to base fields with multiple columns is broken