Merge pull request #10754 from totten/master-actcase-ts