Over the years, things got reused and changed, making the current names somewhat unclear in what they actually mean and do. (cherry picked from commit 30172fc037)
30172fc037