Patch 2
Finished feature 50887415/test-full-story-diff.