fixup! fixup! Merge branch 's/partitioned-tableinfo' into m/partitioned_insert