Merge "Add more status information to spline following"