Merge "Improve the use of pointer" into main