Bug 40562: Reorganize patchset
This MR supersedes !242 (closed). Please refer to the original MR and to #40562 (closed) for additional comments.
This MR supersedes !242 (closed). Please refer to the original MR and to #40562 (closed) for additional comments.