Merge branch 'jc/cutoff-config'