Storybook for Pull Request 6574

Commit 4f1530116ec3283751ee419e33edf11c06e84776 for Pull Request 6574