[tor-commits] [metrics-tasks/master] Merge remote-tracking branch 'gsathya/bug_1854_v2'