Merge votes improvements from master (fixes).