Merge remote-tracking branch 'origin/feature/11736_add_torsocks_config' into feature/stretch (refs: #11736)