we need to optimize when adding an edit constraint
Merge remote-tracking branch 'origin/master' into loci/r