Merge "VPP: arm voting back on without test"