Merge "Document OJSI-34 vulnerability"