fixup! Merge branch 'master' into partitioned-table