Update Material
Change ALl API: empty->is_null
fix merge
Merge branch 'master' into publish