added check on the retry label too
Merge remote-tracking branch 'origin/master'