merging latest changes to 7.x-4.x-842-donation-amount-sort-order