P2P/P2R Legacy Upgrade DEV

REPRODUCE_ONLY