[tor-commits] [tpo/master] Merge remote-tracking branch 'gitlab-tpo/antonela-master-patch-11284'