Merge pull request #7297 from illume/upstream-storybook-pod-mocks