Merge remote-tracking branch 'origin/feature/11403-tor-browser-6.x' into feature/11403-tor-browser-6.x