Fixed merging options dict
Merge pull request #12524 from rchrd/12523

Fixed merging options dict