Patch for Bug 1928579 (OPTIONAL handling)