Change Details

This applies @anlambert's comments on D8908 (I renamed the file since, and didn't want to end up with a rebase hell, so I'm opening a new diff)

This applies @anlambert's comments on D8908 (I renamed the file since, and didn't want to end up with a rebase hell, so I'm opening a new diff) Depends on D8919