Fix #2470 Do not mutate options in _prepareModel
Merge pull request #2783 from caseywebdev/gh-2470

Fix #2470 Do not mutate options in _prepareModel
Test for #2666.