#3092722: This is a new branch rebased off 2.0.x. Attempting to rebase the existing branch on the issue resulted in a non-mergeable MR.
Closes #3092722