fix: rollback
fix: bit better mesh
Merge remote-tracking branch 'upstream/master' into next