add veto ability to cls merger
various bugfix things
Merge remote branch 'github/master'