Merge "Remove the active deletion action of callbacks" into main