fix for SPC-944 add multimap
fix for SPC-949
JUNIPER-ONLY: merge code for SPC 939