Vendor import nvi-2.1.2-c80f493b038 a multikey mapping fix

PR:		bin/182463