Merge "Update the comment about tag limit"