fix bug #33689
Merge branch 'master' of github.com:coderintherye/KivaAppCopy