Merge "Address drawMesh API feedback"