Merge branch 'jk/config-die-bad-number-noreturn'