Merge "Added comments describing the span limit attributes"