[z2354] Add missing change of backport 2e96cdb