Make Option
non-required & add required
attr
#530
Merged
Option
non-required & add required
attr
#530