Merge remote-tracking branch 'origin/stable' into test/10777-robust-boot-menu-with-more-fragile-tests