Merge "Portmapping for SRGs with multiple circuit packs"