Merge pull request #1438 from rzhxeo/fktv