Merge pull request #17757 from colemanw/karmaTime