Fixes: #20581 (closed)
No tests yet, some plumbing needs finished first.
Cc: @brad.king @kyle.edwards