Pulling in some good changes from voter branch