Fixes #2503 and #1786
Merge pull request #2504 from pods-framework/feature/2503-find-fetch-save

Fixes #2503 and #1786