Rebase decimal changes on tpch_work branch!