Merge branch 'ad/bisect-terms' into maint