Merge branch 'drebs/bug/6022_fix-call-to-verify-file' into develop