Merge "Document fixed OJSI-118 vulnerability"