fix instance undefined
Merge branch 'optional-schema-and-instance'