Fix multiref mapping#1106

jch-13 merged 2 commits intonf-core:devnf-core/eager:devfrom

jch-13:dsl2-fix-shardingjch-13/eager:dsl2-fix-shardingCopy head branch name to clipboard