Change Details

This will make a following diff a little easier. Depends on D13829

This will make a following diff a little easier. Depends on D13831

This will make a following diff a little easier. Depends on D1382931