Change Details

Split out from D47090. This patch is based on top of (depends on) D47111, but I'm posting it now for review.

Depends on D46806 D47109 D47344 D47111

Split out from D47090. This patch is based on top of (dDepends on) D47111, but I'm posting it now for review. D46806 D47109 D47344 D47111