Version 2.8.4

Bugfix release for 2.8 branch. Will contain cherry-picked commits from main, when necessary.