core-5238 fix output filename issue

cherry-picked from de-common-module@55a6152ed68af7a0ab4a9e6dfae322dd7e9acfa0 master branch.