bugfix release with backports from 9.3
This tag has no release notes.