8 Commits (lakebane-optimize)