Downstream packets matching wrong flow with BAL3.4.8.5

I am noticing an issue with BAL3.4.8.5 where packets in downstream are hitting the wrong flow.

When there are more than one ONUs on a PON and more than one ONUs are provisioned with subscriber flows, the downstream traffic hits the flows of the last provisioned subscriber. The issue happens to service traffic which shares the same s-vid/c-vid/o_pbits/pkt_tag_type for all subscribers on the PON and the only differentiating factor that you could do in downstream is dst_mac.