Storybook for Pull Request 6587

Commit 347b777b6f1b8238cfa727b9f6d451f463bdaa1a for Pull Request 6587