"Already done flag" Story backend implementation (bugId: 96978)
merged changes from upstream