Yesterday
merge from indirect_instancing (exception fix)