Merge branch 'bugfix/17125-fragile-persistent-bookmarks-test+force-all-tests' into devel (Closes: #17125)