Merge "Fixes for info votes"