Merge R8 tracker #8375.