Backport/pim 2747