Fixed empty options issue
Merge branch 'instance-config-fix'