[MAINTENANCE] Backport/pim 2747