drag point
Merge branch '130_gmpas_take_2' into develop