- First commit to issue fork.
Rebased MR against 11.x, and h/t alexpott for changing MR target branch.
Changed to use an inline template test instead. All tests passing now.
Per note from alexpott on Slack, pushed commits to clean up some todos around this issue.