fix backport from old branch
2 files changed