Merge branch 'jk/config-int-range-check'