Merge instanced buffer changes (reverting my own for now)