Fixed merging poll_profiles from master.