"Add AMIT Statement Data" pro-rata tool incorrectly mixes trust and non-trust income for stapled securities

I've run into an issue with the "Add/Update AMIT Statement" tool on a holding that has both trust income and an ordinary dividend recorded in the same financial year, such as a stapled security. When I set up two separate income records for the year, one flagged as Trust Income with the dividend fields left at zero, and one flagged as not trust income holding the real franked amount and franking credits, opening the AMIT statement tool pre-fills "Franked distributions from trusts" and "Share of franking credits from franked dividends" using the franked amount and franking credits from the record I'd explicitly flagged as not trust income. Both of those fields should read zero on my actual statement, since that income is an ordinary company dividend, not a trust distribution. The tool also spreads the trust only figures, non-primary production income, capital gains, foreign income, and the AMIT cost base increase, proportionally across all the records sharing that financial year instead of applying them only to the record flagged as trust income. This creates incorrect data in income statements which were recorded earlier mixing or erasing correctly recorded data in non-trust income records.