Also return generator for special task mark finish
Merge remote-tracking branch 'origin/master'