Merge remote-tracking branch 'shamb0/issue-7143-pallet-treasury-refactor' into issue-7143-pallet-treasury-refactor