Changes:
Actually fix work with L2VLAN (0.5.4 fix was incomplete)
PR: 169482 Submitted by: marck (maintainer)