Merge remote-tracking branch 'origin/stable' into bugfix/10840-automatically-test-dotfiles-persistence