Bring certain files in line with `develop`

This is in lieu of cherry-picking #9575