Merge "distribution-check should not skip vote"