Merge "fix potential leakage issues" into main