[8028] Missing part of [7879] commit.