Rebase decimal on top of tpch-work branch!