Restore Row extractor
Merge pull request #3494 from cchantep/backport-3049

Restore Row extractor: backport #3049