Merge branch 'calc-in-parse-amount'