=str removing duplicate fold sink definition on Sink
Merge pull request #16186 from ktoso/fix-remove-dup-fold-ktoso

=str removing duplicate fold sink definition on Sink