this needs to be picked to fix the build of vfs_commit: d4ea319e7ad9ee2fc2fad0c016845f820681569a
Karolin, please pick for the release
Pushed to v3-6-test. Closing out bug report. Thanks!