Merge "Fix potentially misleading safety comment." into main