Merge pull request #6978 from remitamine/fktv