Merge branch '5185-amount-conversion-do-amount-conversion-for-cashtocode' into 5187-amount-conversion-do-amount-conversion-for-paypal