[1969] base.ch.legacy.feature p2 integration fix