fix version for entry_options
and entry_type
#5817
Merged
entry_options
and entry_type
#5817