Remove add your election
Merge branch 'release/v2.0.18'