Missed one

Port from release-1.24