[Fixed] shuttle load in points

Change-Id: I5ee90f6be6386531cde0ba5f223b10e0a9ab24ed
Merge "[Fixed] shuttle load in points" into unstable