Merge "Add constraint for waypoints"