Fix evaluation of predef option when it's an object
Merge branch 'bugs/fix-predef-object-evaluation'