I've faced this identical trouble. But what about making more subtasks if guardian story gets moved to following sprint? For eg., possessing two 'Implementation' subtasks is often usual but ensure their Take care of version differs (within our case a sprint is usually a new edition. So this won't function for all). In essence, this scrum ceremony