Merge pull request #11713 from mskvortsov/Ckfinite