#21337 terminate-action changes