Merge pull request #1841 from ariard/2022-11-revoked-balance-non-aggregable