Replace defaultOptions
with addOptions
#2088
Merged
defaultOptions
with addOptions
#2088