v0.41.1 - non-vbo support