Merge pull request #7660 from etracer65/fix_kiwif4_use_acc