New primo mapping key
Merge remote-tracking branch 'origin/4.8.2' into 4.8.2