Merge pull request #6832 from illume/upstream-storybook-crd-mocks