Storybook for Pull Request 6595

Commit 54925c4899e1fc0752c9b027bc00aafa4918f662 for Pull Request 6595