Storybook for Pull Request 6577

Commit 32c117bed057b3428ccd9eaf920f08a19a00a36a for Pull Request 6577