[tor-commits] [atlas/master] Merge remote-tracking branch 'hellais/task-6361' into task-6361