Merge "Add BuildPickingRay to devel api" into devel/master