Fixes #2553
Merge pull request #2554 from pods-framework/feature/2553

Fixes #2553