Merge remote branch 'refs/remotes/wulf/publish_1500_calc_numbers' into calc-in-parse...