We recently released v0.13.12 which contains changes from #1916 and #1905. We should make sure these changes are both in v0.14 (main) and in v0.15 (next) branches. The changes from #1905 may already be there, but I don't think #1916 has been propagated yet.