Merge "Fixed an error adding duplicate primary position.y" into devel/master