Merge pull request #4479 from stevew817/backport_4247

Backport 2.x: Dispatch MAC operations through the driver interface