Correct options.history assignment when options.enabledHistory used.
Merge branch 'hotfix/1.7.0.1'