Merge pull request #8607 from mmaraya/port-mirroring-1.4.4