Refine the struct-ptr to make it simple
Merge branch 'master' into dev