Merge branch 'precalc_last-2' into precalc_last-uf