[Fixes#66734344] [Fixes#66734386] complete the stories