Merge pull request #20037 from mattwire/amountstandardprop