jarioksa Merge branch 'threshold-ids'