- Add workaround for pairs of `'` being stripped (#8074)  Backport of #8050
- Fix typo in FluidBlockWrapper (#7880)