#13658 refactor mapper func