Rerolling patch 41.

Dan Lobellerequested to merge
issue/paragraphs-2569361:2569361-maintain-focus-on into 8.x-1.x

Closes #2569361

Merge request reports