Merge "[OOM] move helm3 to helm3.5"