Today
Merge from foliage_instancing