[master] merge w/ tag_2 Fix test error of coordinates