Merge branch 'configurable-thresholds'