1.1 backports pim 2916