UI fix on candidates
Merge branch 'release/v2.0.17'