Ensure executionDidEnd
hooks are only called once
#6846
Merged
executionDidEnd
hooks are only called once
#6846