Backport PLINK-313
Assigning to pskopek since he pleaded to PL issues for EAP6
Committed to the prod-eap6.2.3 branch