Squashed branch for manual updates