Fix broken build due to merging nested options support
Merge pull request #1006 from slick/tmp/nested-options4-fix

Fix broken build due to merging nested options support