forward merge #14300