(cherry picked from commit 8e68dabe) (cherry picked from commit 35a1cc50)
Ref: teams/automation/issues#9 (closed)