[tor-commits] [atlas/master] Merge branch 'task/20374'