Pull in updates from columnizer_base