Merge pull request #5796 from jamming/kakutef7Test