Add choice validator.
Merge branch 'release/0.6.1'