Don't need :required if :Default is set
Merge branch 'elasticsearch'