Merge branch 'ps/reftable-fixes' into ps/reftable-fixes-and-optims