Fix 9.2 conflicts for "Fix error thrown with missing note fragment in DOM"
- Encountered conflicts while picking !11700 (merged) onto
9-2-stable
- Please fix the conflicts and merge this into
9-2-stable
/cc @ClemMakesApps
9-2-stable
9-2-stable
/cc @ClemMakesApps