Forward merge #14378