Merge branch 'dev'
fill out Point api for 2.4.x