Merge pull request #13178 from eileenmcnaughton/net_amount_form