Merge branch 'ps/report-failure-from-git-stash'